Fix rebase

This commit is contained in:
Gustavo Maximiliano Cortez 2016-02-15 10:50:06 -05:00
commit 2384ebcf25

View file

@ -1379,7 +1379,6 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
} }
} }
<<<<<<< a4ed15ab6f9cb6ec415196f24ddee81005a8f3d6
/* Confirmation popup */ /* Confirmation popup */
.confirmTxModal { .confirmTxModal {