Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

missed node 4 - es6 updates in blueprints #6934

Merged
merged 1 commit into from Apr 3, 2017
Merged

Conversation

kellyselden
Copy link
Member

No description provided.

@twokul
Copy link
Contributor

twokul commented Apr 2, 2017

@kellyselden needs a rebase

@homu
Copy link
Contributor

homu commented Apr 2, 2017

☔ The latest upstream changes (presumably #6937) made this pull request unmergeable. Please resolve the merge conflicts.

@kellyselden
Copy link
Member Author

Fixed.

@twokul twokul merged commit 29f0e9a into ember-cli:master Apr 3, 2017
@kellyselden kellyselden deleted the es6 branch April 3, 2017 02:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants