From a841491b6a5ed42d0957189b41e5e48fb5415b32 Mon Sep 17 00:00:00 2001
From: Dennis Dang <dangggdennis@gmail.com>
Date: Thu, 1 Nov 2018 10:15:55 -0700
Subject: [PATCH] Fix _require text and globalThis

---
 test/_require.js | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/test/_require.js b/test/_require.js
index 147d35af..6c9eecaa 100644
--- 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;