This commit is contained in:
2024-08-11 18:25:42 -03:00
parent 1fc1a0a2a2
commit 253a5d70d7
33 changed files with 705 additions and 26 deletions

View File

@@ -17,6 +17,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\
@@ -47,3 +48,6 @@ build_property.ProjectDir = C:\Users\fedpo\Desktop\final actual\Modelo\
=======
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Modelo\
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\Modelo\
>>>>>>> 88e614d (god)