diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
index c077cbe..0005e6b 100644
--- a/.vs/VSWorkspaceState.json
+++ b/.vs/VSWorkspaceState.json
@@ -2,17 +2,9 @@
   "ExpandedNodes": [
     "",
     "\\admin",
-<<<<<<< HEAD
-<<<<<<< HEAD
-    "\\Cuentas",
-    "\\database",
-=======
->>>>>>> 24f7b01847ca194a06677fedb9c9f495654c5ce3
-=======
     "\\Empleados",
->>>>>>> ae6945f7e474edb1bde1c277c092d25b221e151b
     "\\Ventas"
   ],
-  "SelectedNode": "\\Empleados\\EditarEmpleado1.cs",
+  "SelectedNode": "\\admin\\editar.cs",
   "PreviewInSolutionExplorer": false
 }
\ No newline at end of file
diff --git a/.vs/compabetoOG/v17/.wsuo b/.vs/compabetoOG/v17/.wsuo
index 7854eb6..0d7910a 100644
Binary files a/.vs/compabetoOG/v17/.wsuo and b/.vs/compabetoOG/v17/.wsuo differ