god

2024-08-11 18:25:42 -03:00
parent 1fc1a0a2a2
commit 253a5d70d7
33 changed files with 705 additions and 26 deletions
--- a/Informes/obj/project.nuget.cache
+++ b/Informes/obj/project.nuget.cache
@@ -1,8 +1,14 @@
 {
  "version": 2,
+<<<<<<< HEAD
  "dgSpecHash": "Ian++6B1NqIxA+qVrKokw3x0mM8boJBnjkPyOn4AE5xJmkJbvi4dQCmPH53OKIHN/E2wTNGL7PPg/dPRvJIwEg==",
  "success": true,
  "projectFilePath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj",
+=======
+  "dgSpecHash": "LNnYsLsyYVQ4fuL9pNFk9cO8Boe/+luXWUaSQqclJgBskwz1g0BEBYEIZmCiL8av7FykKX2WDu3pRy0mom6AAg==",
+  "success": true,
+  "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj",
+>>>>>>> 88e614d (god)
  "expectedPackageFiles": [],
  "logs": []
 }