god
This commit is contained in:
@@ -18,6 +18,7 @@ build_property.RootNamespace = Vista
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
<<<<<<< HEAD
|
||||
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Vista/
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Vista\
|
||||
@@ -51,3 +52,6 @@ build_property.ProjectDir = C:\Users\fedpo\Desktop\final actual\Vista\
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Vista\
|
||||
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
|
||||
=======
|
||||
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\Vista\
|
||||
>>>>>>> 88e614d (god)
|
||||
|
||||
Reference in New Issue
Block a user