Skip to content

Change esnext.promise to es2018.promise#22292

Merged
mhegazy merged 5 commits into
microsoft:masterfrom
YuichiNukiyama:change_esnext_to_es2018
Mar 3, 2018
Merged

Change esnext.promise to es2018.promise#22292
mhegazy merged 5 commits into
microsoft:masterfrom
YuichiNukiyama:change_esnext_to_es2018

Conversation

@YuichiNukiyama
Copy link
Copy Markdown
Contributor

assertParseResult(["--lib", "es5,invalidOption", "0.ts"],
{
errors: [{
<<<<<<< HEAD
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

can you handle these merge conflicts as well.

@mhegazy
Copy link
Copy Markdown
Contributor

mhegazy commented Mar 2, 2018

thanks @YuichiNukiyama! we jsut need the merge conflicts addressed and test passing and we are good to go.

@mhegazy mhegazy merged commit 25525bc into microsoft:master Mar 3, 2018
@mhegazy
Copy link
Copy Markdown
Contributor

mhegazy commented Mar 3, 2018

thanks!

@YuichiNukiyama YuichiNukiyama deleted the change_esnext_to_es2018 branch March 3, 2018 01:25
@microsoft microsoft locked and limited conversation to collaborators Jul 3, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants