diff --git a/B4A/C_Cliente.bas b/B4A/C_Cliente.bas
index f179883..1a41708 100644
--- a/B4A/C_Cliente.bas
+++ b/B4A/C_Cliente.bas
@@ -833,7 +833,7 @@ Sub B_IMP2_Click
 		c.Close
 	End If
 	LogColor(perfil,Colors.Magenta)
-	
+	Log(1)
 	c=Starter.skmt.ExecQuery("select USUARIO from usuarioa")
 	c.Position=0
 	usuario = c.GetString("USUARIO")
@@ -847,17 +847,17 @@ Sub B_IMP2_Click
 	c.Close
 	
 	ProgressDialogShow("Imprimiendo, un momento ...")
-'	Printer1.DisConnect
+	Printer1.DisConnect
 	If Not(Printer1.IsConnected) Then
 		Log("conectando 1")
 		Printer1.Connect
 		Private cont As Int = 0
 		Do While Not(impresoraConectada)
-'			Log("conectando ...")
 			Sleep(1000)
 			cont = cont + 1
-			If cont = 2 Then Printer1.Connect 'Tratamos de reconectar
-			If cont > 3 Then impresoraConectada = True
+			Log("x")
+			If cont = 7 Then Printer1.Connect 'Tratamos de reconectar
+			If cont > 15 Then impresoraConectada = True
 		Loop
 		Sleep(500)
 		impresoraConectada = False
@@ -866,11 +866,10 @@ Sub B_IMP2_Click
 		Printer1.Connect
 		Private cont As Int = 0
 		Do While Not(impresoraConectada) Or Not(Printer1.IsConnected)
-'			Log("conectando ...")
 			Sleep(1000)
 			cont = cont + 1
 			If cont = 2 Then Printer1.Connect
-			If cont > 3 Then impresoraConectada = True
+			If cont > 4 Then impresoraConectada = True
 		Loop
 		Sleep(500)
 		impresoraConectada = False
diff --git a/B4A/Durakelo.b4a.meta b/B4A/Durakelo.b4a.meta
index b01c1e4..0d681d2 100644
--- a/B4A/Durakelo.b4a.meta
+++ b/B4A/Durakelo.b4a.meta
@@ -70,6 +70,10 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
+<<<<<<< .mine
 NavigationStack=Diseñador Visual,Cliente.bal,-100,1,C_Cliente,B4XPage_Appear,204,6,Starter,Timer1_Tick,67,0,Starter,ENVIA_ULTIMA_GPS,91,0,Starter,Process_Globals,20,0,C_Productos,Class_Globals,0,0,C_Principal,trabajar_Click,437,0,C_Principal,connecta_Click,1957,0,C_Cliente,Class_Globals,0,0,C_Cliente,gest_Click,438,0,C_Cliente,B_VENTA_Click,1230,0
+=======
+NavigationStack=C_Cliente,Class_Globals,145,0,C_Principal,cargar_Click,958,0,C_Cliente,B_INV_Click,1117,0,C_Cliente,GPS_LocationChanged,362,0,C_Cliente,gest_Click,434,0,C_Cliente,B_VENTA_Click,1226,0,C_Cliente,B_IMP2_Click,846,5,C_Cliente,initialize,149,0,C_Cliente,Printer1_Connected,1344,1,C_Cliente,B_EXIBI_Click,1322,0
+>>>>>>> .theirs
 SelectedBuild=0
 VisibleModules=21,2,9,18,7,10,22,11,23,4