aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
Diffstat (limited to 'test')
-rw-r--r--test/unit/tx-state-history-helper.js3
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
})