Esteban MIno e743f44150 fix conflicts

2018-08-28 15:20:30 -03:00

..

controllers

fix conflicts

2018-08-28 15:20:30 -03:00

account-import-strategies.spec.js

fix warning for unit tests

2018-07-02 20:12:50 -04:00

buy-eth-url.spec.js

…

ComposableObservableStore.js

…

edge-encryptor-test.js

fix warning for unit tests

2018-07-02 20:12:50 -04:00

message-manager-test.js

…

nodeify-test.js

fix tests

2018-07-02 20:21:27 -04:00

pending-balance-test.js

fix warning for unit tests

2018-07-02 20:12:50 -04:00

personal-message-manager-test.js

…

seed-phrase-verifier-test.js

fix warning for unit tests

2018-07-02 20:12:50 -04:00

util-test.js

eslint --fix .

2018-07-02 18:49:33 -04:00