fix conflicts

eslint · Apr 8, 2020 · 0ef3d7f · 0ef3d7f
1 parent 1947378
commit 0ef3d7f
Showing 1 changed file with 0 additions and 5 deletions.
diff --git a/lib/shared/relative-module-resolver.js b/lib/shared/relative-module-resolver.js
@@ -11,12 +11,7 @@ const Module = require("module");
  * `Module.createRequire` is added in v12.2.0. It supports URL as well.
  * We only support the case where the argument is a filepath, not a URL.
  */
-<<<<<<< HEAD
-// eslint-disable-next-line node/no-unsupported-features/node-builtins, node/no-deprecated-api
-const createRequire = Module.createRequire || Module.createRequireFromPath;
-=======
 const createRequire = Module.createRequire || Module.createRequireFromPath; // eslint-disable-line node/no-unsupported-features/node-builtins, node/no-deprecated-api
->>>>>>> Upgrade: some (dev) deps
 
 module.exports = {