Punto copiar todo
This commit is contained in:
@@ -91,12 +91,8 @@ 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\carsu\source\repos\compabetoOG\obj\Debug\compabetov2.Confirmacion.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
|
||||
=======
|
||||
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