diff --git a/src/app/modules/pago-tarjeta/pago-tarjeta.component.ts b/src/app/modules/pago-tarjeta/pago-tarjeta.component.ts
index e52574e..8d0ad9f 100644
--- a/src/app/modules/pago-tarjeta/pago-tarjeta.component.ts
+++ b/src/app/modules/pago-tarjeta/pago-tarjeta.component.ts
@@ -12,13 +12,9 @@ import { Subscription } from 'rxjs';
 })
 export class PagoTarjetaComponent implements OnInit, OnDestroy {
   timer: any;
-<<<<<<< HEAD
   subscription: Subscription;
-  @ViewChild('template', { static: true }) public template: TemplateRef<any>;
-=======
-  @ViewChild('template', {static: true}) public template: TemplateRef<any>;
   modalRef: BsModalRef;
->>>>>>> 94610cc5cc92408a3384da70848a2722dc5b6bc5
+  @ViewChild('template', { static: true }) public template: TemplateRef<any>;
 
   constructor(
     private articuloService: ArticuloService,