Resolve merge conflicts

1 files changed, 0 insertions, 16 deletions

diff --git a/test/unit/account-link-test.js b/test/unit/account-link-test.js
deleted file mode 100644
index 47a961d1f..000000000
--- a/test/unit/account-link-test.js
+++ /dev/null
@@ -1,16 +0,0 @@
-var assert = require('assert')
-var linkGen = require('../../ui/lib/account-link')
-
-describe('account-link', function () {
-  it('adds ropsten prefix to ropsten test network', function () {
-    var result = linkGen('account', '3')
-    assert.notEqual(result.indexOf('ropsten'), -1, 'ropsten included')
-    assert.notEqual(result.indexOf('account'), -1, 'account included')
-  })
-
-  it('adds kovan prefix to kovan test network', function () {
-    var result = linkGen('account', '42')
-    assert.notEqual(result.indexOf('kovan'), -1, 'kovan included')
-    assert.notEqual(result.indexOf('account'), -1, 'account included')
-  })
-})