cosas que faltaban
This commit is contained in:
@@ -11,6 +11,7 @@ build_property.RootNamespace = Modelo
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\
|
||||
@@ -23,3 +24,6 @@ build_property.EnableGeneratedComInterfaceComImportInterop =
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Modelo\
|
||||
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Modelo\
|
||||
>>>>>>> c493033 (cosas que faltaban)
|
||||
|
||||
Reference in New Issue
Block a user