resuelto merge en info formas de pago

Luis Suarez
1 parent f68a44db2b
Showing 1 changed file with 0 additions and 4 deletions Show diff stats
src/app/modules/info-formas-pago/info-formas-pago.component.html
@@ -11,12 +11,8 @@
   </div>
   <div class="h-85">
     <div class="row h-auto mt-6 mx-0 justify-content-center text-center">
-<<<<<<< HEAD
       <div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-end border
                   border-secondary rounded reduce-card-1">
-=======
-      <div class="col-7 col-xl-4 p-5 m-5 h-auto align-self-end border border-secondary rounded">
->>>>>>> 7004c1df495d5ac2e703f7ff659d1d8c3b384953
         <img
           draggable="false"
           ondragstart="return false;"
...	...	@@ -11,12 +11,8 @@
11	11	</div>
12	12	<div class="h-85">
13	13	<div class="row h-auto mt-6 mx-0 justify-content-center text-center">
14		-<<<<<<< HEAD
15	14	<div class="col-7 col-lg-4 p-5 m-5 h-auto align-self-end border
16	15	border-secondary rounded reduce-card-1">
17		-=======
18		- <div class="col-7 col-xl-4 p-5 m-5 h-auto align-self-end border border-secondary rounded">
19		->>>>>>> 7004c1df495d5ac2e703f7ff659d1d8c3b384953
20	16	<img
21	17	draggable="false"
22	18	ondragstart="return false;"