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

fix backup file

Browse source
This commit is contained in:
Gabriel Bazán 2016-08-19 13:14:23 -03:00
commit 572220689a
3 changed files with 6 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
public/views/backup.html
View file

@ -2,20 +2,9 @@
<ion-nav-bar class="bar-stable">
<ion-nav-title>Backup Flow</ion-nav-title>
<ion-nav-buttons side="primary">
<<<<<<< 5b14c8aca37bc7b15324fdbbed162dea8cc2d3af
<button class="button no-border" ng-click="goToStep(1)" ng-show="(step != 1 && step != 4)">
<i class="icon ion-chevron-left"></i>
</button>
</ion-nav-buttons>
<ion-nav-buttons side="secondary">
  <span class="button no-border" ng-click="goBack()">
<i class="icon ion-close"></i>
</span>
=======
 <button class="button" href ui-sref="wallet.preferences">
     <i class="ion-arrow-left-c"></i> Back
   </button>
>>>>>>> delete focused wallet
  </ion-nav-buttons>
</ion-nav-bar>
<ion-content ng-controller="backupController" cache-view="false" ng-init="init()">