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

por ahora todo menos orden de compra y remito

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:25:17 -03:00
parent ab890dbf98
commit 75c9f8ed9b
72 changed files with 985 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13574,6 +13574,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"projectName": "Vista",
@@ -13611,10 +13612,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\final actual\\Vista\\Vista.csproj",
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Vista\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -13642,6 +13646,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -13690,10 +13695,15 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"C:\\Users\\fedpo\\Desktop\\final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Controladora\\Controladora.csproj"
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
},
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj"
@@ -13702,6 +13712,10 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
=======
"C:\\Users\\fedpo\\Desktop\\final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\final actual\\Informes\\Informes.csproj"
>>>>>>> 8e394af (por ahora todo menos orden de compra y remito)
}
}
}