fix merge conflicts

1 files changed, 0 insertions, 3 deletions

diff --git a/test/unit/app/controllers/currency-controller-test.js b/test/unit/app/controllers/currency-controller-test.js
index 1941d1c43..7c4644d9f 100644
--- a/test/unit/app/controllers/currency-controller-test.js
+++ b/test/unit/app/controllers/currency-controller-test.js
@@ -1,6 +1,3 @@
-// polyfill fetch
-global.fetch = global.fetch || require('isomorphic-fetch')
-
 const assert = require('assert')
 const nock = require('nock')
 const CurrencyController = require('../../../../app/scripts/controllers/currency')