fix conflict

2014-08-01 11:38:07 -03:00 · 2014-08-01 11:38:07 -03:00 · 2d3fdbe6fb
commit 2d3fdbe6fb
parent a9f0bc5c6f c2345fa77c
14 changed files with 57 additions and 12 deletions
--- a/views/modals/qr-address.html
+++ b/views/modals/qr-address.html
@ -1,6 +1,6 @@
 <div class="text-center">
  <qrcode size="250" data="{{address.address}}"></qrcode>
-  
+
  <div class="m10t">
    <h4>{{address.address}}</h4>
    <span ng-if="$root.updatingBalance">