anders/Wallet
1
0
Fork 0
Code Issues Projects Releases Packages Wiki Activity

fix conflict

Browse source
This commit is contained in:
bechi 2014-12-01 14:11:55 -03:00
commit a30fc703af
2 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
views/includes/transaction.html
View file

@ -9,8 +9,8 @@
<div class="row" ng-repeat="out in tx.outs">
<div class="large-3 medium-3 small-4 columns">
<div class="size-12">
<span>{{out.value}} {{$root.wallet.settings.unitName}}</span>
<span class="label secondary round">
<b>{{out.value}} {{$root.wallet.settings.unitName}}</b>
<span class="alt-currency gray">
{{out.alternativeAmount}} {{out.alternativeIsoCode}}
</span>
</div>