bajar cambios 9

.vs/VSWorkspaceState.json

@@ -1,9 +1,11 @@
 {
   "ExpandedNodes": [
-    "",
+    ""
-    "\\Properties",
-    "\\Properties\\DataSources"
   ],
+<<<<<<< HEAD
+  "SelectedNode": "\\agregarmermas.cs",
+=======
   "SelectedNode": "\\vender.cs",
+>>>>>>> 53dd047ba99d9fe2f8dc36472f5d1441d992e695
   "PreviewInSolutionExplorer": false
 }

inventario.cs

@@ -155,9 +155,9 @@ namespace compabetov2
         private void button1_Click(object sender, EventArgs e)
         {
             MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal);
-            menuPrincipal.Show();
+            menuPrincipal.ShowDialog();
 
-            this.Dispose();
+            this.Close();
 
         }
 

mermas.cs

@@ -147,7 +147,7 @@ namespace compabetov2
         private void button1_Click(object sender, EventArgs e)
         {
             MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal);
-            menuPrincipal.Show();
+            menuPrincipal.ShowDialog();
             this.Dispose(true);
         }
 

obj/Debug/compabetov2.csproj.FileListAbsolute.txt

@@ -103,3 +103,7 @@ C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ModificarContra.re
 C:\Users\carsu\Source\Repos\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources
 C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.verMerma.resources
 C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources
+C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ActualizarMerma.resources
+C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.agregarmermas.resources
+C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.ModificarContra.resources
+C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.verMerma.resources

personal.cs

@@ -227,7 +227,7 @@ namespace compabetov2
         private void button1_Click(object sender, EventArgs e)
         {
             MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal);
-            menuPrincipal.Show();
+            menuPrincipal.ShowDialog();
             this.Dispose(true);
         }
     }

vender.cs

@@ -363,7 +363,7 @@ namespace compabetov2
         private void button1_Click(object sender, EventArgs e)
         {
             MenuPrincipal menuPrincipal = new MenuPrincipal(loginPrincipal);
-            menuPrincipal.Show();
+            menuPrincipal.ShowDialog();
             this.Dispose(true);
         }