This commit is contained in:
2024-08-11 18:25:42 -03:00
parent 1fc1a0a2a2
commit 253a5d70d7
33 changed files with 705 additions and 26 deletions

View File

@@ -9,6 +9,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {}
},
@@ -94,6 +95,19 @@
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Entidades\\obj\\",
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {}
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Entidades\\obj\\",
>>>>>>> 88e614d (god)
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -182,6 +196,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {
>>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
@@ -247,6 +262,16 @@
>>>>>>> d9b810b (guardado hecho hasta ordenes de compra)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Desktop\\Final actual\\Modelo\\obj\\",
=======
"C:\\Users\\fedpo\\Downloads\\Final actua2l\\Final actual\\Modelo\\Modelo.csproj": {
"version": "1.0.0",
"restore": {
"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",
@@ -276,6 +301,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -315,6 +341,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)
}
}
}