preparando merge
This commit is contained in:
@@ -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)
|
||||
|
||||
Reference in New Issue
Block a user