diff --git a/Cuentas/cuentas.Designer.cs b/Cuentas/cuentas.Designer.cs index 4feaee7..b30a8f8 100644 --- a/Cuentas/cuentas.Designer.cs +++ b/Cuentas/cuentas.Designer.cs @@ -152,6 +152,7 @@ // // panelCuenta // + this.panelCuenta.AutoScroll = true; this.panelCuenta.Location = new System.Drawing.Point(524, 292); this.panelCuenta.Margin = new System.Windows.Forms.Padding(4); this.panelCuenta.Name = "panelCuenta"; diff --git a/bin/Debug/compabetov2.exe b/bin/Debug/compabetov2.exe index 85303a9..62f524c 100644 Binary files a/bin/Debug/compabetov2.exe and b/bin/Debug/compabetov2.exe differ diff --git a/bin/Debug/compabetov2.pdb b/bin/Debug/compabetov2.pdb index 688f7d3..548473f 100644 Binary files a/bin/Debug/compabetov2.pdb and b/bin/Debug/compabetov2.pdb differ diff --git a/bin/Debug/data.db b/bin/Debug/data.db index 7c25ca0..107b455 100644 Binary files a/bin/Debug/data.db and b/bin/Debug/data.db differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 0527a59..10a1a65 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 951a680..5f3125c 100644 Binary files a/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache index f86fa1f..654a195 100644 --- a/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache +++ b/obj/Debug/compabetov2.csproj.CoreCompileInputs.cache @@ -1,5 +1 @@ -<<<<<<< HEAD -3f62af869539c2801b7da3577ef2feb00e7c32f1cefc777b57202fa5ad70cc96 -======= -02f8dd8032cdd900c4c7a30e0d2445335e555a7c7084d974934c829cadebfeb5 ->>>>>>> 080e4640be9b07fc95a949fb1d8b60393000f770 +0aeb254002a0ce305fc1196d5eb6afeb21b30aa751f3290ac831261142a98d95 diff --git a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt index c4acda8..a688061 100644 --- a/obj/Debug/compabetov2.csproj.FileListAbsolute.txt +++ b/obj/Debug/compabetov2.csproj.FileListAbsolute.txt @@ -98,3 +98,4 @@ C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.pdb C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosEnvio.resources C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources +C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Ventas.datosCuenta.resources diff --git a/obj/Debug/compabetov2.csproj.GenerateResource.cache b/obj/Debug/compabetov2.csproj.GenerateResource.cache index c44ce35..96ec853 100644 Binary files a/obj/Debug/compabetov2.csproj.GenerateResource.cache and b/obj/Debug/compabetov2.csproj.GenerateResource.cache differ diff --git a/obj/Debug/compabetov2.exe b/obj/Debug/compabetov2.exe index 85303a9..62f524c 100644 Binary files a/obj/Debug/compabetov2.exe and b/obj/Debug/compabetov2.exe differ diff --git a/obj/Debug/compabetov2.pdb b/obj/Debug/compabetov2.pdb index 688f7d3..548473f 100644 Binary files a/obj/Debug/compabetov2.pdb and b/obj/Debug/compabetov2.pdb differ