This commit is contained in:
Matias Alejo Garcia 2014-04-30 13:57:13 -03:00
parent ab12832126
commit 79b72f8eec
2 changed files with 423 additions and 5 deletions

View File

@ -313,7 +313,6 @@ hr { margin: 2.25rem 0;}
padding: 2.7px;
}
<<<<<<< HEAD
.tx-copayers {
background: #F8F8F8;
-moz-box-shadow: inset 0px 0px 4px 0px rgba(0,0,0,0.05), inset 0px 1px 1px 0px rgba(0,0,0,0.05);
@ -337,7 +336,4 @@ hr { margin: 2.25rem 0;}
color: #fff;
background: #C0392B;
}
=======
>>>>>>> item tx new style

View File

@ -1 +0,0 @@
../../bitcore/browser/bundle.js

423
lib/bitcore.js Normal file

File diff suppressed because one or more lines are too long