Punto Solution
This commit is contained in:
Binary file not shown.
@@ -1 +1 @@
|
||||
afcee79e89ecbbd9a66338909aef75a56f5f932f
|
||||
e81505b63e90e240cb3d334138353bc4b39d1592d688dbc8cdcd7b719763abb9
|
||||
|
||||
@@ -91,6 +91,12 @@ 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
|
||||
<<<<<<< HEAD
|
||||
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
|
||||
=======
|
||||
C:\Users\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.preguntaLogin.resources
|
||||
>>>>>>> eab9fb5b336bb49d36153ea4d79de023f54c3fb4
|
||||
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.preguntaLogin.resources
|
||||
C:\Users\Googl\Documents\compabetoOG\obj\Debug\compabetov2.Confirmacion.resources
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in New Issue
Block a user