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

@@ -9,6 +9,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "NrgVcMaE+xOpA8UnmFhQwGflGRDAICnz8EffGQ+5vJrqniVecS26UDqJMYcJ2SmlijA3PT49NDmcrKADdBbkcQ==",
"success": true,
@@ -317,6 +318,11 @@
>>>>>>> f2457d4 (no pude usar controladoras, no carga los datos ,interface de cliente y provedor)
"success": true,
"projectFilePath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Vista\\Vista.csproj",
=======
"dgSpecHash": "8O54Be40m1Txh4/yS94pgfZLToVC+LV7WkHDBd0OnlEQUA/u/2EQnUp2winJs5G2h4rq07QDB0yyVOk5XrwxSw==",
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj",
>>>>>>> 88e614d (god)
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
=======