Change

Orden variables

Change
Orden variables
Marcelo Puebla
1 parent 554a319682
Showing 1 changed file with 1 additions and 5 deletions Show diff stats
src/app/modules/pago-tarjeta/pago-tarjeta.component.ts
@@ -12,13 +12,9 @@ import { Subscription } from &#39;rxjs&#39;;
 })
 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,
...	...	@@ -12,13 +12,9 @@ import { Subscription } from 'rxjs';
12	12	})
13	13	export class PagoTarjetaComponent implements OnInit, OnDestroy {
14	14	timer: any;
15		-<<<<<<< HEAD
16	15	subscription: Subscription;
17		- @ViewChild('template', { static: true }) public template: TemplateRef<any>;
18		-=======
19		- @ViewChild('template', {static: true}) public template: TemplateRef<any>;
20	16	modalRef: BsModalRef;
21		->>>>>>> 94610cc5cc92408a3384da70848a2722dc5b6bc5
	17	+ @ViewChild('template', { static: true }) public template: TemplateRef<any>;
22	18
23	19	constructor(
24	20	private articuloService: ArticuloService,