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

cosas que faltaban

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:23:17 -03:00
parent 08cb7d769f
commit c6ed194e04
77 changed files with 2333 additions and 25531 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Modelo/obj/project.assets.json
View File

@@ -38,6 +38,7 @@
"restore": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj",
"projectName": "Modelo",
@@ -63,10 +64,13 @@
"/home/fede/.nuget/NuGet/NuGet.Config"
=======
"projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj",
>>>>>>> c493033 (cosas que faltaban)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -90,6 +94,7 @@
"projectReferences": {
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -105,6 +110,10 @@
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj"
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
=======
"C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj"
>>>>>>> c493033 (cosas que faltaban)
}
}
}