fix

Nicolás Guarnieri
1 parent 47e6ce85d4
Showing 1 changed file with 2 additions and 6 deletions Show diff stats
src/views/nota-pedido.html
@@ -421,14 +421,10 @@
                                             style="height: auto; line-height: 1.1em"
                                         >
                                     </div>
-<<<<<<< HEAD
                                     <div class="col px-1 text-right">
-                                        <span ng-bind="articuloACargar.precio | currency: notaPedido.moneda.simbolo : 4"></span>
-=======
-                                    <div class="col-3 px-1 text-right">
                                         <span ng-bind="articuloACargar.precio |
-                                            currency: notaPedido.moneda.SIMBOLO : 4"></span>
->>>>>>> master
+                                            currency: notaPedido.moneda.SIMBOLO : 4"
+                                        ></span>
                                     </div>
                                     <div class="col px-1 text-right">
                                         <span
...	...	@@ -421,14 +421,10 @@
421	421	style="height: auto; line-height: 1.1em"
422	422	>
423	423	</div>
424		-<<<<<<< HEAD
425	424	<div class="col px-1 text-right">
426		- <span ng-bind="articuloACargar.precio \| currency: notaPedido.moneda.simbolo : 4"></span>
427		-=======
428		- <div class="col-3 px-1 text-right">
429	425	<span ng-bind="articuloACargar.precio \|
430		- currency: notaPedido.moneda.SIMBOLO : 4"></span>
431		->>>>>>> master
	426	+ currency: notaPedido.moneda.SIMBOLO : 4"
	427	+ ></span>
432	428	</div>
433	429	<div class="col px-1 text-right">
434	430	<span