fede/Final_OOP
Archived
2
0
Fork 0
Code Issues 4 Pull Requests 1 Packages Projects 2 Releases Wiki Activity

trayendo cambios de nacho

Browse Source
This commit is contained in:
fedpo
2024-08-06 06:26:05 +01:00
parent d9b810b550 88e614d538
commit f03870d284
61 changed files with 606 additions and 368 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Vista/obj/project.assets.json
View File

@@ -89,11 +89,19 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\",
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj",
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Vista\\obj\\",
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -111,6 +119,7 @@
"net6.0-windows7.0": {
"targetAlias": "net6.0-windows",
"projectReferences": {
<<<<<<< HEAD
"C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj"
},
@@ -119,6 +128,16 @@
},
"C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Informes\\Informes.csproj"
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Controladora\\Controladora.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
},
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Informes\\Informes.csproj"
>>>>>>> 88e614d538344c4aeb32449ffc15cff3993b7857
}
}
}