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

fix merge conflicts

Browse source
This commit is contained in:
Marty Alcala 2016-10-18 17:23:43 -04:00
commit 78bd523391
272 changed files with 8069 additions and 5496 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/sass/views/views.scss
View file

@ -12,6 +12,7 @@
@import "walletDetails";
@import "advancedSettings";
@import "bitpayCard";
@import "bitpayCardIntro";
@import "address-book";
@import "wallet-backup-phrase";
@import "zero-state";
@ -30,4 +31,5 @@
@import "includes/txp-details";
@import "includes/tx-status";
@import "includes/walletSelector";
@import "integrations/coinbase.scss";
@import "integrations/coinbase";
@import "integrations/glidera";