cambios nacho

This commit is contained in:
2024-08-11 18:24:34 -03:00
parent 3beec95408
commit b62fa7b021
52 changed files with 745 additions and 101 deletions

View File

@@ -40,6 +40,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj",
"projectName": "Modelo",
@@ -71,10 +72,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
>>>>>>> 3925b59 (cambios nacho)
"projectName": "Modelo",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\Modelo.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\Modelo.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Modelo\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Modelo\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -100,6 +104,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -123,6 +128,10 @@
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj"
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj"
>>>>>>> 3925b59 (cambios nacho)
}
}
}