cosas que faltaban

2024-08-11 18:23:17 -03:00
parent 08cb7d769f
commit c6ed194e04
77 changed files with 2333 additions and 25531 deletions
--- a/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig
+++ b/Modelo/obj/Debug/net6.0/Modelo.GeneratedMSBuildEditorConfig.editorconfig
@@ -11,6 +11,7 @@ build_property.RootNamespace = Modelo
 <<<<<<< HEAD
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 build_property.ProjectDir = /home/fede/proyectos/Final_OOP/Modelo/
 =======
 build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Modelo\
@@ -23,3 +24,6 @@ build_property.EnableGeneratedComInterfaceComImportInterop =
 =======
 build_property.ProjectDir = C:\Users\fedpo\source\repos\Final_OOP\Modelo\
 >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
+=======
+build_property.ProjectDir = C:\Users\fedpo\Downloads\Final\Final\Modelo\
+>>>>>>> c493033 (cosas que faltaban)
--- a/Modelo/obj/Modelo.csproj.nuget.dgspec.json
+++ b/Modelo/obj/Modelo.csproj.nuget.dgspec.json
@@ -3,6 +3,7 @@
  "restore": {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
    "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj": {}
  },
@@ -23,13 +24,17 @@
 =======
    "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {}
 >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
+=======
+    "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": {}
+>>>>>>> c493033 (cosas que faltaban)
  },
  "projects": {
-    "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
+    "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {
      "version": "1.0.0",
      "restore": {
-        "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj",
+        "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj",
        "projectName": "Entidades",
+<<<<<<< HEAD
 <<<<<<< HEAD
        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Entidades\\Entidades.csproj",
        "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -44,8 +49,11 @@
          "/home/fede/.nuget/NuGet/NuGet.Config"
 =======
        "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj",
+=======
+        "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj",
+>>>>>>> c493033 (cosas que faltaban)
        "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
-        "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\obj\\",
+        "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\obj\\",
        "projectStyle": "PackageReference",
        "configFilePaths": [
          "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -129,12 +137,17 @@
        }
      }
    },
+<<<<<<< HEAD
    "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj": {
 >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
+=======
+    "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj": {
+>>>>>>> c493033 (cosas que faltaban)
      "version": "1.0.0",
      "restore": {
-        "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
+        "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj",
        "projectName": "Modelo",
+<<<<<<< HEAD
 <<<<<<< HEAD
        "projectPath": "C:\\Users\\Nacho\\Source\\Repos\\Final_OOP\\Modelo\\Modelo.csproj",
        "packagesPath": "C:\\Users\\Nacho\\.nuget\\packages\\",
@@ -149,8 +162,11 @@
          "/home/fede/.nuget/NuGet/NuGet.Config"
 =======
        "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
+=======
+        "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj",
+>>>>>>> c493033 (cosas que faltaban)
        "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
-        "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\obj\\",
+        "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\obj\\",
        "projectStyle": "PackageReference",
        "configFilePaths": [
          "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -174,6 +190,7 @@
            "projectReferences": {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
              "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
                "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -189,6 +206,10 @@
              "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
                "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj"
 >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
+=======
+              "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {
+                "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj"
+>>>>>>> c493033 (cosas que faltaban)
              }
            }
          }
--- a/Modelo/obj/project.assets.json
+++ b/Modelo/obj/project.assets.json
@@ -38,6 +38,7 @@
    "restore": {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
      "projectUniqueName": "/home/fede/proyectos/Final_OOP/Modelo/Modelo.csproj",
      "projectName": "Modelo",
@@ -63,10 +64,13 @@
        "/home/fede/.nuget/NuGet/NuGet.Config"
 =======
      "projectUniqueName": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
+=======
+      "projectUniqueName": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj",
+>>>>>>> c493033 (cosas que faltaban)
      "projectName": "Modelo",
-      "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
+      "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj",
      "packagesPath": "C:\\Users\\fedpo\\.nuget\\packages\\",
-      "outputPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\obj\\",
+      "outputPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\obj\\",
      "projectStyle": "PackageReference",
      "configFilePaths": [
        "C:\\Users\\fedpo\\AppData\\Roaming\\NuGet\\NuGet.Config",
@@ -90,6 +94,7 @@
          "projectReferences": {
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
            "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj": {
              "projectPath": "/home/fede/proyectos/Final_OOP/Entidades/Entidades.csproj"
@@ -105,6 +110,10 @@
            "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj": {
              "projectPath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Entidades\\Entidades.csproj"
 >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
+=======
+            "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj": {
+              "projectPath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Entidades\\Entidades.csproj"
+>>>>>>> c493033 (cosas que faltaban)
            }
          }
        }
--- a/Modelo/obj/project.nuget.cache
+++ b/Modelo/obj/project.nuget.cache
@@ -2,6 +2,7 @@
  "version": 2,
 <<<<<<< HEAD
 <<<<<<< HEAD
+<<<<<<< HEAD
 <<<<<<< HEAD
  "dgSpecHash": "druJUlWKmOp0ZDp0BX75o9Fs1GyoqoIkTLLMStpqDmZBEy8hoSreNrR/4qjyFeX2PbXxwtpQp0hY2GY2ewsTOQ==",
  "success": true,
@@ -18,8 +19,11 @@
 =======
  "dgSpecHash": "Lbp3ldB0Hrw5pXllkp+TBPvDxt/9rPRNHHKZTqTlG4g88ELwAzlQEuFOATRGWgN+sSkhjGassnHFTlqrUfwaQA==",
 >>>>>>> 51676e6 (feat: Cambios Varios (mirar Desc))
+=======
+  "dgSpecHash": "pw7jedCv+5Z7cgVNhso+oycHNF67O1XyYT4HUnm6ukG4VUtgCv2G8NovbqYT02ZK0eONOKuhRbtsHdtFWeVAnw==",
+>>>>>>> c493033 (cosas que faltaban)
  "success": true,
-  "projectFilePath": "C:\\Users\\fedpo\\source\\repos\\Final_OOP\\Modelo\\Modelo.csproj",
+  "projectFilePath": "C:\\Users\\fedpo\\Downloads\\Final\\Final\\Modelo\\Modelo.csproj",
  "expectedPackageFiles": [],
 >>>>>>> 8ad9dc6 (faltan controladoras)
  "logs": []