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/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Informes/obj/Debug/net6.0/Informes.GeneratedMSBuildEditorConfig.editorconfig
@@ -8,4 +8,8 @@ build_property.PlatformNeutralAssembly =
 build_property.EnforceExtendedAnalyzerRules = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = Informes
+<<<<<<< HEAD
 build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Informes\
+=======
+build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\Informes\
+>>>>>>> 88e614d (god)
--- a/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache
+++ b/Informes/obj/Debug/net6.0/Informes.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-100fa21bf2f76b06ab70964d65200e354f5837e3
+3fd66116ceaea5e07433507fe6494c4f357d71a3a526da0eea8f6d1df7fb86c5
--- a/Informes/obj/Debug/net6.0/ref/Informes.dll
+++ b/Informes/obj/Debug/net6.0/ref/Informes.dll
--- a/Informes/obj/Debug/net6.0/refint/Informes.dll
+++ b/Informes/obj/Debug/net6.0/refint/Informes.dll