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

infromes y solucionado error chistoso en repoLote

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:26:31 -03:00
parent 6f5a2ae4c8
commit 04268f23e5
23 changed files with 469 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -5447,6 +5447,7 @@
"framework": ".NETCoreApp,Version=v6.0",
"dependencies": {
"Entidades": "1.0.0",
"Informes": "1.0.0",
"Modelo": "1.0.0"
},
"compile": {
@@ -13579,6 +13580,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"projectName": "Vista",
@@ -13627,9 +13629,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Vista\\obj\\",
<<<<<<< HEAD
@@ -13645,6 +13651,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Vista\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Vista\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -13677,6 +13686,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -13739,13 +13749,18 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Controladora\\Controladora.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
},
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj"
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< 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"
@@ -13779,6 +13794,10 @@
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Informes\\Informes.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Informes\\Informes.csproj"
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
}
}
}