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

merge gigante

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:19:38 -03:00
parent 6498597664
commit 1aded875ab
84 changed files with 3063 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13475,11 +13475,19 @@
"project": {
"version": "1.0.0",
"restore": {
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
"projectName": "Controladora",
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj",
"packagesPath": "/home/fede/.nuget/packages/",
"outputPath": "/home/fede/proyectos/Final_OOP/Controladora/obj/",
=======
"projectUniqueName": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
"projectName": "Controladora",
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\Controladora.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
"outputPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Controladora\\obj\\",
>>>>>>> 8ad9dc6 (faltan controladoras)
"projectStyle": "PackageReference",
"configFilePaths": [
"/home/fede/.nuget/NuGet/NuGet.Config"
@@ -13495,11 +13503,19 @@
"net6.0": {
"targetAlias": "net6.0",
"projectReferences": {
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
},
"/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj"
=======
"C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Entidades\\Entidades.csproj"
},
"C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj": {
"projectPath": "C:\\Users\\Nacho\\source\\repos\\Final\\Modelo\\Modelo.csproj"
>>>>>>> 8ad9dc6 (faltan controladoras)
}
}
}