AAAAAAAAAAA

2024-08-11 18:26:19 -03:00
parent 66be7e6a69
commit 6f5a2ae4c8
18 changed files with 308 additions and 108 deletions
--- a/Informes/obj/project.nuget.cache
+++ b/Informes/obj/project.nuget.cache
@@ -1,6 +1,7 @@
 {
  "version": 2,
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
  "dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
  "success": true,
@@ -15,6 +16,11 @@
  "success": true,
  "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
 >>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
+=======
+  "dgSpecHash": "+fAmxvUxzXFJdL6cjwnLzpFPUy6kbZ77RHAmwP73fYrskGO9Qznx7rWzPtjjeDphCNfQ5J+s1nW7KRZF6IabWg==",
+  "success": true,
+  "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj",
+>>>>>>> 855ce7c (AAAAAAAAAAA)
  "expectedPackageFiles": [],
  "logs": []
 }