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

AAAAAAAAAAA

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:26:19 -03:00
parent 66be7e6a69
commit 6f5a2ae4c8
18 changed files with 308 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
Controladora/obj/project.assets.json
View File

@@ -65,6 +65,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
"projectName": "Controladora",
@@ -110,9 +111,13 @@
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
"projectUniqueName": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj",
>>>>>>> 855ce7c (AAAAAAAAAAA)
"projectName": "Controladora",
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\Controladora.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
<<<<<<< HEAD
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Controladora\\obj\\",
<<<<<<< HEAD
=======
@@ -124,6 +129,9 @@
>>>>>>> 88e614d (god)
=======
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
=======
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Controladora\\obj\\",
>>>>>>> 855ce7c (AAAAAAAAAAA)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -155,6 +163,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -236,6 +245,13 @@
>>>>>>> 88e614d (god)
=======
>>>>>>> a9ebcff (añadida ¿Reactividad? a que se elija entre percedero o no)
=======
"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\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final_OOP-master\\final_oop\\Modelo\\Modelo.csproj"
>>>>>>> 855ce7c (AAAAAAAAAAA)
}
}
}