merge gigante

This commit is contained in:
2024-08-11 18:19:38 -03:00
parent 6498597664
commit 1aded875ab
84 changed files with 3063 additions and 84 deletions

View File

@@ -8,6 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Modelo
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\
>>>>>>> 8ad9dc6 (faltan controladoras)
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =