fix: resolve conflicts

nodejs · May 29, 2020 · a5dad50 · a5dad50
1 parent b29beef
commit a5dad50
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 12 deletions.
diff --git a/lib/internal/errors.js b/lib/internal/errors.js
@@ -19,12 +19,9 @@ const {
   NumberIsInteger,
   ObjectDefineProperty,
   ObjectKeys,
-<<<<<<< HEAD
   StringPrototypeSlice,
   StringPrototypeStartsWith,
-=======
   String,
->>>>>>> lib: add String primordials
   Symbol,
   SymbolFor,
   WeakMap,

diff --git a/lib/internal/event_target.js b/lib/internal/event_target.js
@@ -6,6 +6,7 @@ const {
   Map,
   Object,
   Set,
+  String,
   Symbol,
   NumberIsNaN,
 } = primordials;

diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -39,10 +39,7 @@ const {
   ReflectSet,
   RegExpPrototypeTest,
   SafeMap,
-<<<<<<< HEAD
   SafeWeakMap,
-=======
->>>>>>> lib: add String primordials
   String,
   StringPrototypeIndexOf,
   StringPrototypeLastIndexOf,

diff --git a/lib/internal/readline/utils.js b/lib/internal/readline/utils.js
@@ -1,13 +1,8 @@
 'use strict';
 
 const {
-<<<<<<< HEAD
-  Symbol,
-=======
-  Boolean,
-  NumberIsInteger,
   String,
->>>>>>> lib: add String primordials
+  Symbol
 } = primordials;
 
 const kUTF16SurrogateThreshold = 0x10000; // 2 ** 16