merge gigante

Modelo/obj/project.nuget.cache

@@ -1,5 +1,6 @@
 {
   "version": 2,
+<<<<<<< HEAD
   "dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==",
   "success": true,
   "projectFilePath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj",
@@ -7,5 +8,11 @@
     "/home/fede/.nuget/packages/microsoft.netcore.app.ref/6.0.31/microsoft.netcore.app.ref.6.0.31.nupkg.sha512",
     "/home/fede/.nuget/packages/microsoft.aspnetcore.app.ref/6.0.31/microsoft.aspnetcore.app.ref.6.0.31.nupkg.sha512"
   ],
+=======
+  "dgSpecHash": "xK3JnXpdCUpoZcekhyP91lNk41C1CsX+md42EcLnzhmp4nv0wa9QUPqxaUDvd+ItjZUDnL5nqMnWsYofgtcCWA==",
+  "success": true,
+  "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj",
+  "expectedPackageFiles": [],
+>>>>>>> 8ad9dc6 (faltan controladoras)
   "logs": []
 }