diff --git a/Controladora/bin/Debug/net6.0/Controladora.dll b/Controladora/bin/Debug/net6.0/Controladora.dll index 750cce1..cb1676e 100644 Binary files a/Controladora/bin/Debug/net6.0/Controladora.dll and b/Controladora/bin/Debug/net6.0/Controladora.dll differ diff --git a/Controladora/bin/Debug/net6.0/Controladora.pdb b/Controladora/bin/Debug/net6.0/Controladora.pdb index a33d107..90eb3c2 100644 Binary files a/Controladora/bin/Debug/net6.0/Controladora.pdb and b/Controladora/bin/Debug/net6.0/Controladora.pdb differ diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.BuildWithSkipAnalyzers b/Controladora/obj/Debug/net6.0/Controladora.csproj.BuildWithSkipAnalyzers deleted file mode 100644 index e69de29..0000000 diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache index d0af5da..7658e09 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.CoreCompileInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -07cbdde4e47ec2d3a6db548797ff84a15aa08946633217fe5ed64773b3cc8491 -======= a7a9c23e29aac78d8fc99e5e2578c73ffe3d4cba ->>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 diff --git a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt index e362374..451af54 100644 --- a/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt +++ b/Controladora/obj/Debug/net6.0/Controladora.csproj.FileListAbsolute.txt @@ -1,122 +1,3 @@ -C:\Users\Nacho\Desktop\verdadero\Controladora\bin\Debug\net6.0\Controladora.deps.json -C:\Users\Nacho\Desktop\verdadero\Controladora\bin\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Desktop\verdadero\Controladora\bin\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache -C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig -C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache -C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs -C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache -C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\refint\Controladora.dll -C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Desktop\verdadero\Controladora\obj\Debug\net6.0\ref\Controladora.dll -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.dll -C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll -C:\Users\Nacho\source\repos\Final\Controladora\obj\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\refint\Controladora.dll -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.deps.json -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.dll -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.dll -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.pdb -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.pdb -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date -C:\Users\Nacho\Source\Repos\Final_OOP\Controladora\obj\Debug\net6.0\ref\Controladora.dll -C:\Users\fedpo\source\repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.deps.json -C:\Users\fedpo\source\repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.dll -C:\Users\fedpo\source\repos\Final_OOP\Controladora\bin\Debug\net6.0\Controladora.pdb -C:\Users\fedpo\source\repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.dll -C:\Users\fedpo\source\repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.dll -C:\Users\fedpo\source\repos\Final_OOP\Controladora\bin\Debug\net6.0\Modelo.pdb -C:\Users\fedpo\source\repos\Final_OOP\Controladora\bin\Debug\net6.0\Entidades.pdb -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.dll -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\refint\Controladora.dll -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\Controladora.pdb -C:\Users\fedpo\source\repos\Final_OOP\Controladora\obj\Debug\net6.0\ref\Controladora.dll -C:\Users\Nacho\Desktop\Final\Controladora\bin\Debug\net6.0\Controladora.deps.json -C:\Users\Nacho\Desktop\Final\Controladora\bin\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Desktop\Final\Controladora\bin\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Desktop\Final\Controladora\bin\Debug\net6.0\Entidades.dll -C:\Users\Nacho\Desktop\Final\Controladora\bin\Debug\net6.0\Modelo.dll -C:\Users\Nacho\Desktop\Final\Controladora\bin\Debug\net6.0\Modelo.pdb -C:\Users\Nacho\Desktop\Final\Controladora\bin\Debug\net6.0\Entidades.pdb -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date -C:\Users\Nacho\Desktop\Final\Controladora\obj\Debug\net6.0\ref\Controladora.dll -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\bin\Debug\net6.0\Controladora.deps.json -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\bin\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\bin\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\bin\Debug\net6.0\Entidades.dll -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\bin\Debug\net6.0\Modelo.dll -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\bin\Debug\net6.0\Modelo.pdb -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\bin\Debug\net6.0\Entidades.pdb -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Desktop\ASDDD\Final\Controladora\obj\Debug\net6.0\ref\Controladora.dll -C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Controladora.deps.json -C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Controladora.dll -C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Controladora.pdb -C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Entidades.dll -C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Modelo.dll -C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Modelo.pdb -C:\Users\fedpo\Downloads\Final\Final\Controladora\bin\Debug\net6.0\Entidades.pdb -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.csproj.CopyComplete -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.dll -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\refint\Controladora.dll -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\Controladora.pdb -C:\Users\fedpo\Downloads\Final\Final\Controladora\obj\Debug\net6.0\ref\Controladora.dll -C:\Users\Nacho\Desktop\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json -C:\Users\Nacho\Desktop\final actual\Controladora\bin\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Desktop\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Desktop\final actual\Controladora\bin\Debug\net6.0\Entidades.dll -C:\Users\Nacho\Desktop\final actual\Controladora\bin\Debug\net6.0\Modelo.dll -C:\Users\Nacho\Desktop\final actual\Controladora\bin\Debug\net6.0\Modelo.pdb -C:\Users\Nacho\Desktop\final actual\Controladora\bin\Debug\net6.0\Entidades.pdb -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.AssemblyReference.cache -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.GeneratedMSBuildEditorConfig.editorconfig -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfoInputs.cache -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.AssemblyInfo.cs -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.csproj.CoreCompileInputs.cache -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controla.1EE7A4DA.Up2Date -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.dll -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb -C:\Users\Nacho\Desktop\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll -<<<<<<< HEAD -======= C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.deps.json C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.dll C:\Users\fedpo\Downloads\final actual\final actual\Controladora\bin\Debug\net6.0\Controladora.pdb @@ -134,4 +15,3 @@ C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0 C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\refint\Controladora.dll C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\Controladora.pdb C:\Users\fedpo\Downloads\final actual\final actual\Controladora\obj\Debug\net6.0\ref\Controladora.dll ->>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 diff --git a/Controladora/obj/Debug/net6.0/Controladora.dll b/Controladora/obj/Debug/net6.0/Controladora.dll index 750cce1..cb1676e 100644 Binary files a/Controladora/obj/Debug/net6.0/Controladora.dll and b/Controladora/obj/Debug/net6.0/Controladora.dll differ diff --git a/Controladora/obj/Debug/net6.0/Controladora.pdb b/Controladora/obj/Debug/net6.0/Controladora.pdb index a33d107..90eb3c2 100644 Binary files a/Controladora/obj/Debug/net6.0/Controladora.pdb and b/Controladora/obj/Debug/net6.0/Controladora.pdb differ diff --git a/Controladora/obj/Debug/net6.0/ref/Controladora.dll b/Controladora/obj/Debug/net6.0/ref/Controladora.dll index 8a0bf5b..344a73d 100644 Binary files a/Controladora/obj/Debug/net6.0/ref/Controladora.dll and b/Controladora/obj/Debug/net6.0/ref/Controladora.dll differ diff --git a/Controladora/obj/Debug/net6.0/refint/Controladora.dll b/Controladora/obj/Debug/net6.0/refint/Controladora.dll index 8a0bf5b..344a73d 100644 Binary files a/Controladora/obj/Debug/net6.0/refint/Controladora.dll and b/Controladora/obj/Debug/net6.0/refint/Controladora.dll differ diff --git a/Controladora/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs b/Controladora/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs deleted file mode 100644 index ed92695..0000000 --- a/Controladora/obj/Release/net6.0/.NETCoreApp,Version=v6.0.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETCoreApp,Version=v6.0", FrameworkDisplayName = ".NET 6.0")] diff --git a/Controladora/obj/Release/net6.0/Controladora.AssemblyInfo.cs b/Controladora/obj/Release/net6.0/Controladora.AssemblyInfo.cs deleted file mode 100644 index d45f32a..0000000 --- a/Controladora/obj/Release/net6.0/Controladora.AssemblyInfo.cs +++ /dev/null @@ -1,23 +0,0 @@ -//------------------------------------------------------------------------------ -// -// Este código fue generado por una herramienta. -// Versión de runtime:4.0.30319.42000 -// -// Los cambios en este archivo podrían causar un comportamiento incorrecto y se perderán si -// se vuelve a generar el código. -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("Controladora")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Release")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+abfd18e86f40a98925507ec03c2e8832ee47a3eb")] -[assembly: System.Reflection.AssemblyProductAttribute("Controladora")] -[assembly: System.Reflection.AssemblyTitleAttribute("Controladora")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] - -// Generado por la clase WriteCodeFragment de MSBuild. - diff --git a/Controladora/obj/Release/net6.0/Controladora.AssemblyInfoInputs.cache b/Controladora/obj/Release/net6.0/Controladora.AssemblyInfoInputs.cache deleted file mode 100644 index 5e5f4f9..0000000 --- a/Controladora/obj/Release/net6.0/Controladora.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -1300c7ac552248a2e20058b6f2d7f7eb38539ca91bc222d9d6bfd7bbcb24e9ab diff --git a/Controladora/obj/Release/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig b/Controladora/obj/Release/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 0750616..0000000 --- a/Controladora/obj/Release/net6.0/Controladora.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,13 +0,0 @@ -is_global = true -build_property.TargetFramework = net6.0 -build_property.TargetPlatformMinVersion = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property.EnforceExtendedAnalyzerRules = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = Controladora -build_property.ProjectDir = C:\Users\Nacho\source\repos\Final\Controladora\ -build_property.EnableComHosting = -build_property.EnableGeneratedComInterfaceComImportInterop = diff --git a/Controladora/obj/Release/net6.0/Controladora.GlobalUsings.g.cs b/Controladora/obj/Release/net6.0/Controladora.GlobalUsings.g.cs deleted file mode 100644 index 8578f3d..0000000 --- a/Controladora/obj/Release/net6.0/Controladora.GlobalUsings.g.cs +++ /dev/null @@ -1,8 +0,0 @@ -// -global using global::System; -global using global::System.Collections.Generic; -global using global::System.IO; -global using global::System.Linq; -global using global::System.Net.Http; -global using global::System.Threading; -global using global::System.Threading.Tasks; diff --git a/Controladora/obj/Release/net6.0/Controladora.assets.cache b/Controladora/obj/Release/net6.0/Controladora.assets.cache deleted file mode 100644 index cc1d7f3..0000000 Binary files a/Controladora/obj/Release/net6.0/Controladora.assets.cache and /dev/null differ diff --git a/Controladora/obj/Release/net6.0/Controladora.csproj.AssemblyReference.cache b/Controladora/obj/Release/net6.0/Controladora.csproj.AssemblyReference.cache deleted file mode 100644 index 62093d4..0000000 Binary files a/Controladora/obj/Release/net6.0/Controladora.csproj.AssemblyReference.cache and /dev/null differ diff --git a/Entidades/Lote.cs b/Entidades/Lote.cs index c555008..6735959 100644 --- a/Entidades/Lote.cs +++ b/Entidades/Lote.cs @@ -12,7 +12,6 @@ namespace Entidades { get { return Producto?.Nombre ?? string.Empty; } } -<<<<<<< HEAD public double PrecioUnitario { get { return Producto?.Precio ?? 0; } @@ -21,8 +20,6 @@ namespace Entidades { get { return PrecioUnitario * CantidadDeProductos; } } -======= ->>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 } } diff --git a/Informes/bin/Debug/net6.0/Entidades.dll b/Informes/bin/Debug/net6.0/Entidades.dll index b6098d3..770ba46 100644 Binary files a/Informes/bin/Debug/net6.0/Entidades.dll and b/Informes/bin/Debug/net6.0/Entidades.dll differ diff --git a/Informes/bin/Debug/net6.0/Entidades.pdb b/Informes/bin/Debug/net6.0/Entidades.pdb index 4056183..7ce8350 100644 Binary files a/Informes/bin/Debug/net6.0/Entidades.pdb and b/Informes/bin/Debug/net6.0/Entidades.pdb differ diff --git a/Informes/bin/Debug/net6.0/Informes.dll b/Informes/bin/Debug/net6.0/Informes.dll index 0c591ec..6ac96a3 100644 Binary files a/Informes/bin/Debug/net6.0/Informes.dll and b/Informes/bin/Debug/net6.0/Informes.dll differ diff --git a/Informes/bin/Debug/net6.0/Informes.pdb b/Informes/bin/Debug/net6.0/Informes.pdb index ecc9609..4530cc8 100644 Binary files a/Informes/bin/Debug/net6.0/Informes.pdb and b/Informes/bin/Debug/net6.0/Informes.pdb differ diff --git a/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache b/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache index 8d68f48..014359a 100644 Binary files a/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache and b/Informes/obj/Debug/net6.0/Informes.csproj.AssemblyReference.cache differ diff --git a/Informes/obj/Debug/net6.0/Informes.dll b/Informes/obj/Debug/net6.0/Informes.dll index 0c591ec..6ac96a3 100644 Binary files a/Informes/obj/Debug/net6.0/Informes.dll and b/Informes/obj/Debug/net6.0/Informes.dll differ diff --git a/Informes/obj/Debug/net6.0/Informes.pdb b/Informes/obj/Debug/net6.0/Informes.pdb index ecc9609..4530cc8 100644 Binary files a/Informes/obj/Debug/net6.0/Informes.pdb and b/Informes/obj/Debug/net6.0/Informes.pdb differ diff --git a/Vista/Vista - Backup.csproj.user b/Vista/Vista - Backup.csproj.user index fb55c6b..be79559 100644 --- a/Vista/Vista - Backup.csproj.user +++ b/Vista/Vista - Backup.csproj.user @@ -7,12 +7,9 @@ Form -<<<<<<< HEAD Form -======= ->>>>>>> 5b78d74e54350285696596720e82f5fbd99b4d02 Form