diff options
| author | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
|---|---|---|
| committer | brunobar79 <brunobar79@gmail.com> | 2018-11-21 06:44:28 +0800 |
| commit | 9b1df386de908ae14e0ce169f1231a0d6de77972 (patch) | |
| tree | d7fc663343b7ba3c28dff0022ca018a01bea451c /ui/app/components/send/tests/send-utils.test.js | |
| parent | c0557b43e2c493de73c8bf74cfa9e5740c8cfd3f (diff) | |
| parent | 5956f8d260270d41f1e5be53f3c058782a1ae7f4 (diff) | |
| download | tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.gz tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.tar.zst tangerine-wallet-browser-9b1df386de908ae14e0ce169f1231a0d6de77972.zip | |
fix merge conflicts
Diffstat (limited to 'ui/app/components/send/tests/send-utils.test.js')
| -rw-r--r-- | ui/app/components/send/tests/send-utils.test.js | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ui/app/components/send/tests/send-utils.test.js b/ui/app/components/send/tests/send-utils.test.js index b72d87eee..f31e1221b 100644 --- a/ui/app/components/send/tests/send-utils.test.js +++ b/ui/app/components/send/tests/send-utils.test.js @@ -285,11 +285,10 @@ describe('send utils', () => { [ { value: 123, - fromNumericBase: 'dec', + fromNumericBase: 'hex', }, { value: 'calc:1610', - fromNumericBase: 'dec', }, ] ) |