diff --git a/B4A/C_TicketsDia.bas b/B4A/C_TicketsDia.bas
index 7fda488..8f6868c 100644
--- a/B4A/C_TicketsDia.bas
+++ b/B4A/C_TicketsDia.bas
@@ -74,6 +74,7 @@ Sub B4XPage_Appear
 			Next
 			cursorprueba.Close
 			
+			'LINEA JAVI
 			ListView1.AddTwoLines(c.GetString("PC_CLIENTE"),c.GetString("NOMBRE") &"   Cant. #"& c.GetString("PC_NOART")& " SubTotal $"& sumatotal)
 		Next
 	End If
diff --git a/B4A/KelloggsV3.b4a.meta b/B4A/KelloggsV3.b4a.meta
index ca20c6e..48412b0 100644
--- a/B4A/KelloggsV3.b4a.meta
+++ b/B4A/KelloggsV3.b4a.meta
@@ -82,10 +82,6 @@ ModuleClosedNodes6=
 ModuleClosedNodes7=
 ModuleClosedNodes8=
 ModuleClosedNodes9=
-<<<<<<< HEAD
-NavigationStack=Diseñador Visual,login.bal,-100,1,Diseñador Visual,principal.bal,-100,1,C_Principal,B4XPage_Created,242,0,C_NoVenta,Class_Globals,0,0,C_Clientes,Class_Globals,0,0,C_Cliente,Class_Globals,291,6,C_Nota,B4XPage_Appear,84,0,C_Nota,ListView1_ItemLongClick,320,0,C_Nota,b_desc_Click,353,0,C_Cliente,B4XPage_Appear,427,6,C_Cliente,B_IMP2_Click,1307,6
-=======
-NavigationStack=Diseñador Visual,mapa_rutas.bal,-100,4,Diseñador Visual,detalle_promo.bal,-100,3,Diseñador Visual,checklist.bal,-100,2,Diseñador Visual,checks.bal,-100,2,MAPA_RUTAS,Activity_Create,72,0,Diseñador Visual,errormanager.bal,-100,3,Diseñador Visual,cliente.bal,-100,1,C_Cliente,GPS_LocationChanged,664,6,Diseñador Visual,principal.bal,-100,6,C_Cliente,B_IMP2_Click,1006,0,C_Productos,HACER_PEDIDO,642,0
->>>>>>> d401d75a47181c01d2e8ebe02bcc19443c71d19a
+NavigationStack=C_NoVenta,Class_Globals,0,0,C_Clientes,Class_Globals,0,0,C_Nota,ListView1_ItemLongClick,320,0,C_Nota,b_desc_Click,353,0,C_Cliente,Class_Globals,290,6,C_Cliente,B4XPage_Appear,428,6,C_Cliente,B_IMP2_Click,1295,6,C_Nota,Class_Globals,34,0,C_Nota,B4XPage_Appear,179,0,C_TicketsDia,Class_Globals,8,0,C_TicketsDia,B4XPage_Appear,70,2
 SelectedBuild=0
 VisibleModules=1,2,3,4,5,6,7,8,9,10,14,11