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

feat: terminados 4 de 7 forms

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:25:05 -03:00
parent 502f10131c
commit ab890dbf98
60 changed files with 753 additions and 825 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Vista/obj/project.assets.json
View File

@@ -13573,6 +13573,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectUniqueName": "/home/fede/proyectos/Final_OOP/Vista/Vista.csproj",
"projectName": "Vista",
@@ -13607,10 +13608,13 @@
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
>>>>>>> 3925b59 (cambios nacho)
=======
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj",
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
"projectName": "Vista",
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\Vista.csproj",
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\Vista.csproj",
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Vista\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Vista\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -13637,6 +13641,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj": {
"projectPath": "/home/fede/proyectos/Final_OOP/Controladora/Controladora.csproj"
@@ -13681,13 +13686,22 @@
=======
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Controladora\\Controladora.csproj"
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Controladora\\Controladora.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
},
"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"
"C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Entidades\\Entidades.csproj"
},
<<<<<<< HEAD
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Informes\\Informes.csproj"
>>>>>>> 3925b59 (cambios nacho)
=======
"C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj": {
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\Informes\\Informes.csproj"
>>>>>>> 51cffaf (feat: terminados 4 de 7 forms)
}
}
}