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

god

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:25:42 -03:00
parent 1fc1a0a2a2
commit 253a5d70d7
33 changed files with 705 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -44,6 +44,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj",
"projectName": "Modelo",
@@ -91,6 +92,13 @@
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\obj\\",
>>>>>>> 88e614d (god)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -120,6 +128,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -159,6 +168,10 @@
"C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\Entidades.csproj"
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj"
>>>>>>> 88e614d (god)
}
}
}