fede/Final_Das
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects 1 Releases Wiki Activity

god

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:25:42 -03:00
parent 1fc1a0a2a2
commit 253a5d70d7
33 changed files with 705 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Controladora/obj/Debug/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -18,6 +18,7 @@ build_property.RootNamespace = Controladora
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Controladora/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\
@@ -51,3 +52,6 @@ build_property.ProjectDir = C:\Users\fedpo\Desktop\final actual\Controladora\
=======
build_property.ProjectDir = C:\Users\fedpo\Desktop\Final actual\Controladora\
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actua2l\Final actual\Controladora\
>>>>>>> 88e614d (god)

4
Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache
View File

@@ -1,6 +1,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
07cbdde4e47ec2d3a6db548797ff84a15aa08946633217fe5ed64773b3cc8491
=======
39c8634b9e930bb7c3ea67187f4543b71aaf8be2
@@ -11,3 +12,6 @@ dba3ec7c7a0b4bd2c09ad0be4ae57d8a36772676
=======
de87b0b29efe8d95b2a1e8b4f776d31f322c9a28
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
=======
ce293fa0aef3765d8994aca06d23d78376205fb5466c849fb449e076a6e65011
>>>>>>> 88e614d (god)