Skip to content
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: resolve conflicts
  • Loading branch information
Sebastien-Ahkrin committed May 29, 2020
commit a5dad501538a5692f4fb0a99b943edc2ad74bb5e
3 changes: 0 additions & 3 deletions lib/internal/errors.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,9 @@ const {
NumberIsInteger,
ObjectDefineProperty,
ObjectKeys,
<<<<<<< HEAD
StringPrototypeSlice,
StringPrototypeStartsWith,
=======
String,
>>>>>>> lib: add String primordials
Symbol,
SymbolFor,
WeakMap,
Expand Down
1 change: 1 addition & 0 deletions lib/internal/event_target.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const {
Map,
Object,
Set,
String,
Symbol,
NumberIsNaN,
} = primordials;
Expand Down
3 changes: 0 additions & 3 deletions lib/internal/modules/cjs/loader.js
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,7 @@ const {
ReflectSet,
RegExpPrototypeTest,
SafeMap,
<<<<<<< HEAD
SafeWeakMap,
=======
>>>>>>> lib: add String primordials
String,
StringPrototypeIndexOf,
StringPrototypeLastIndexOf,
Expand Down
7 changes: 1 addition & 6 deletions lib/internal/readline/utils.js
Original file line number Diff line number Diff line change
@@ -1,13 +1,8 @@
'use strict';

const {
<<<<<<< HEAD
Symbol,
=======
Boolean,
NumberIsInteger,
String,
>>>>>>> lib: add String primordials
Symbol
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please keep the trailing comma

Comment thread
Sebastien-Ahkrin marked this conversation as resolved.
Outdated
} = primordials;

const kUTF16SurrogateThreshold = 0x10000; // 2 ** 16
Expand Down