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

14
Entidades/obj/Entidades.csproj.nuget.dgspec.json
View File

@@ -12,6 +12,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {}
},
@@ -55,12 +56,15 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {}
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {}
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
<<<<<<< HEAD
<<<<<<< HEAD
@@ -69,6 +73,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -124,6 +129,11 @@
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",

10
Entidades/obj/project.assets.json
View File

@@ -28,6 +28,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj",
"projectName": "Entidades",
@@ -76,9 +77,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\Entidades.csproj",
"projectPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
<<<<<<< HEAD
@@ -94,6 +99,9 @@
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Entidades\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
=======
"outputPath": "C:\\Users\\fedpo\\Desktop\\FINAL\\Entidades\\obj\\",
>>>>>>> 18c1215 (infromes y solucionado error chistoso en repoLote)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",