merge gigante

Entidades/obj/project.nuget.cache

@@ -1,5 +1,6 @@
 {
   "version": 2,
+<<<<<<< HEAD
   "dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==",
   "success": true,
   "projectFilePath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.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": "tQ5wbjPjSSYF0ufyaHkTpMHeLmctkgU0DRXiByR35mv7fgnebDzFc/FQHskLw18SzYXpGgfy8W7o3/JscpL1ZA==",
+  "success": true,
+  "projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj",
+  "expectedPackageFiles": [],
+>>>>>>> 8ad9dc6 (faltan controladoras)
   "logs": []
 }