merge gigante

Vista/obj/project.nuget.cache

@@ -1,5 +1,6 @@
 {
   "version": 2,
+<<<<<<< HEAD
   "dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==",
   "success": true,
   "projectFilePath": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
@@ -300,5 +301,11 @@
     "/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/6.0.31/microsoft.aspnetcore.app.ref.6.0.31.nupkg.sha512",
     "/home/fede/.nuget/packages/microsoft.netcore.app.host.linux-x64/6.0.31/microsoft.netcore.app.host.linux-x64.6.0.31.nupkg.sha512"
   ],
+=======
+  "dgSpecHash": "tIuYRzaRYu8CXIPBh4BkJLvLrV0+lbBu/oLywxi4tl+wzrbcEqF9p2ndCdBxrhOTXwiWqf0FfmH6xCdhaeSQxA==",
+  "success": true,
+  "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Vista\\Vista.csproj",
+  "expectedPackageFiles": [],
+>>>>>>> 8ad9dc6 (faltan controladoras)
   "logs": []
 }