fix merge conflicts

1 files changed, 5 insertions, 7 deletions

diff --git a/test/unit/migrations/023-test.js b/test/unit/migrations/023-test.js
index be432d9fa..7da94448d 100644
--- a/test/unit/migrations/023-test.js
+++ b/test/unit/migrations/023-test.js
@@ -1,12 +1,11 @@
 const assert = require('assert')
 const migration23 = require('../../../app/scripts/migrations/023')
-const properTime = (new Date()).getTime()
 const storage = {
-  "meta": {},
-  "data": {
-    "TransactionController": {
-      "transactions": [
-      ]
+  'meta': {},
+  'data': {
+    'TransactionController': {
+      'transactions': [
+      ],
     },
   },
 }
@@ -53,7 +52,6 @@ while (transactions20.length < 20) {
 }
 
 
-
 storage.data.TransactionController.transactions = transactions
 
 describe('storage is migrated successfully and the proper transactions are remove from state', () => {