Fix _require text and globalThis

sindresorhus · Nov 1, 2018 · a841491 · a841491
1 parent c9acf25
commit a841491
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/test/_require.js b/test/_require.js
@@ -1,10 +1,5 @@
-<<<<<<< HEAD
 import {URL, URLSearchParams} from 'url';
 import fetch, {Headers, Response} from 'node-fetch';
-=======
-import {URL} from 'url';
-import fetch, {Headers} from 'node-fetch';
->>>>>>> e75b4c35e5566b415608442197dfd878d46c3b17
 
 global.fetch = fetch;
 global.Headers = Headers;