cosas que faltaban

Controladora/obj/project.nuget.cache

@@ -2,6 +2,7 @@
   "version": 2,
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
   "dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==",
   "success": true,
@@ -608,5 +609,11 @@
     "C:\\Users\\fedpo\\.nuget\\packages\\windowsazure.storage\\8.1.4\\windowsazure.storage.8.1.4.nupkg.sha512"
 >>>>>>> 9b0bde2 (fix: arreglado nivel de acceso para las controladoras)
   ],
+=======
+  "dgSpecHash": "7p6sil6BdpeseYcwxc5SCaMq8T52JX3Gb+/veDRUiSWMCYx7lYCBfkail6lsPgISGkw+p3jfoipb6TSmLcP1ZA==",
+  "success": true,
+  "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Controladora\\Controladora.csproj",
+  "expectedPackageFiles": [],
+>>>>>>> c493033 (cosas que faltaban)
   "logs": []
 }