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

merge gigante

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:19:38 -03:00
parent 6498597664
commit 1aded875ab
84 changed files with 3063 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Controladora/obj/Debug/net6.0/Controladora.AssemblyInfoInputs.cache
View File

@@ -1,5 +1,9 @@
<<<<<<< HEAD
<<<<<<< HEAD
d7e6838ab345d847cad4078575babed33718cf28a47b8f27d6c4be1f7f7e97a7
=======
f121c5eeefa8c5e39430715ad45c0dbadc6c8ad0
>>>>>>> 3616449 (preparando merge)
=======
bb93237b0189a4b8b1180fafac8534e65b007ad7d97889b9b241a52a4500d537
>>>>>>> 8ad9dc6 (faltan controladoras)