Cddd

2024-01-14 17:14:58 -07:00
parent 8e2f9ddf15
commit c5de4a1cbe
8 changed files with 4 additions and 5 deletions
@@ -1,5 +1 @@
-<<<<<<< HEAD
-c1cf5d87017027705d6c2ec0d3ad2a8c7ff08f19
-=======
-5d59b1013627d47320299052a443bf2f5f938b5e44e9ca7b957196b5427dd7b6
->>>>>>> 58838e4ed1242ca0331f346a14f3dfa8c9379ee8
+afcee79e89ecbbd9a66338909aef75a56f5f932f
@@ -91,3 +91,6 @@ C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.pdb
 C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources
 C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources
 C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources
+C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarEmpleado.resources
+C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.AgregarLogin.resources
+C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.EditarEmpleado.resources