diff options
| author | kumavis <aaron@kumavis.me> | 2017-10-03 04:45:47 +0800 |
|---|---|---|
| committer | kumavis <aaron@kumavis.me> | 2017-10-03 04:45:47 +0800 |
| commit | 167ad729fdd4fa23a2ec66e648652f3379a2bb51 (patch) | |
| tree | 01e7afaf1ae3e374a1dd27e8ee564f3370d4463b /test/unit | |
| parent | df59ef9942a950a1c5437c69b1af4111f8c07817 (diff) | |
| parent | e08a727d449fb35a1cc5eeed8510e615f8fecb20 (diff) | |
| download | tangerine-wallet-browser-167ad729fdd4fa23a2ec66e648652f3379a2bb51.tar.gz tangerine-wallet-browser-167ad729fdd4fa23a2ec66e648652f3379a2bb51.tar.zst tangerine-wallet-browser-167ad729fdd4fa23a2ec66e648652f3379a2bb51.zip | |
Merge branch 'history-notes' of github.com:MetaMask/metamask-extension into history-notes
Diffstat (limited to 'test/unit')
| -rw-r--r-- | test/unit/tx-state-history-helper.js | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/test/unit/tx-state-history-helper.js b/test/unit/tx-state-history-helper.js index 1590f83d0..79ee26d6e 100644 --- a/test/unit/tx-state-history-helper.js +++ b/test/unit/tx-state-history-helper.js @@ -20,8 +20,6 @@ describe('tx-state-history-helper', function () { }) }) }) -<<<<<<< Updated upstream -======= it('replaying history does not mutate the original obj', function () { const initialState = { test: true, message: 'hello', value: 1 } @@ -45,5 +43,4 @@ describe('tx-state-history-helper', function () { assert.equal(beforeStateSnapshot, afterStateSnapshot, 'initial state is not modified during run') }) ->>>>>>> Stashed changes }) |