preparando merge

This commit is contained in:
2024-08-11 18:18:29 -03:00
parent faa80790ee
commit 6498597664
8 changed files with 35 additions and 3 deletions

View File

@@ -8,6 +8,10 @@ build_property.PlatformNeutralAssembly =
build_property.EnforceExtendedAnalyzerRules =
build_property._SupportedPlatformList = Linux,macOS,Windows
build_property.RootNamespace = Vista
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/
build_property.EnableComHosting =
build_property.EnableGeneratedComInterfaceComImportInterop =
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Vista\
>>>>>>> 3616449 (preparando merge)