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

6
Controladora/obj/project.nuget.cache
View File

@@ -1,8 +1,14 @@
{
"version": 2,
<<<<<<< HEAD
"dgSpecHash": "Vs+HTdq8Gqw56GHRk+ivU0JJ/5n6ghHJP2CKgIV+gDHL9rO3WgHHPoz0OWJjyozNRvnYskqZVibjHcSALkg9JQ==",
"success": true,
"projectFilePath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
=======
"dgSpecHash": "u1rF4F4W8YOwisGSU+O4Veb7LPgLsngYMYPVbuML0HSqxYI2+tPRsVgjjntnLp9J+4QB/odgwOICD9/fwie5gQ==",
"success": false,
"projectFilePath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
>>>>>>> 8ad9dc6 (faltan controladoras)
"expectedPackageFiles": [
"/home/fede/.nuget/packages/emailer/1.0.0/emailer.1.0.0.nupkg.sha512",
"/home/fede/.nuget/packages/libuv/1.10.0/libuv.1.10.0.nupkg.sha512",