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

cambios nacho

Browse Source
This commit is contained in:
fedpo
2024-08-11 18:24:34 -03:00
parent 3beec95408
commit b62fa7b021
52 changed files with 745 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Entidades/obj/Debug/net6.0/Entidades.GeneratedMSBuildEditorConfig.editorconfig
View File

@@ -13,6 +13,7 @@ build_property.RootNamespace = Entidades
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Entidades/
=======
build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Entidades\
@@ -31,3 +32,6 @@ build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Entidades\
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\final actual\final actual\Entidades\
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
build_property.ProjectDir = C:\Users\fedpo\Downloads\Final actual(2)\Final actual\Entidades\
>>>>>>> 3925b59 (cambios nacho)

14
Entidades/obj/Entidades.csproj.nuget.dgspec.json
View File

@@ -5,6 +5,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {}
},
@@ -31,15 +32,19 @@
=======
"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": {}
>>>>>>> 3925b59 (cambios nacho)
},
"projects": {
"C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj": {
"C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj": {
"version": "1.0.0",
"restore": {
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"projectName": "Entidades",
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
"packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -60,8 +65,11 @@
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"projectPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
>>>>>>> 3925b59 (cambios nacho)
"packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\obj\\",
"outputPath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\obj\\",
"projectStyle": "PackageReference",
"configFilePaths": [
"C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",

8
Entidades/obj/project.assets.json
View File

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

6
Entidades/obj/project.nuget.cache
View File

@@ -4,6 +4,7 @@
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
<<<<<<< HEAD
"dgSpecHash": "LSnXGupX+sIU3VjCECy137T1ThKtECGacQq+4Cfd3SDyYEpIcp26yf15qIysqN2+1Fwti7c13f3fBKmUt8i0Og==",
"success": true,
@@ -26,8 +27,11 @@
=======
"dgSpecHash": "xYCKCMKm+oXscuoQamJhNB9nRxekBQBuz6IDgUB/8WpDnH3Ts7NVTClR8NJpQF10id2fDRpsOygcKaFzlcHs+w==",
>>>>>>> 6092f6f (cambios nachito a form factura)
=======
"dgSpecHash": "vCw9TkU23iJeVGdgwKLwcggjjvRCnx4IVmqtdUC1cx6S4CwC+/lso1ry576JGcrpGs6Tvfs4jnEYWVDgrNS9aA==",
>>>>>>> 3925b59 (cambios nacho)
"success": true,
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\final actual\\final actual\\Entidades\\Entidades.csproj",
"projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final actual(2)\\Final actual\\Entidades\\Entidades.csproj",
"expectedPackageFiles": [],
>>>>>>> 8ad9dc6 (faltan controladoras)
"logs": []