Skip to content

Conversation

@chadhietala
Copy link
Contributor

No description provided.

@homu
Copy link
Contributor

homu commented May 5, 2016

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

@chadhietala chadhietala force-pushed the skip-glimmer-tests branch 2 times, most recently from 6af85b3 to cf61817 Compare May 5, 2016 23:06
@krisselden
Copy link
Contributor

sorry about that, it is just because of the deleted test can you rebase?

@chadhietala chadhietala force-pushed the skip-glimmer-tests branch from cf61817 to 9a9d4c1 Compare May 6, 2016 01:49
@krisselden krisselden merged commit b125ff5 into emberjs:master May 6, 2016
@chadhietala chadhietala deleted the skip-glimmer-tests branch May 6, 2016 04:19
toddjordan pushed a commit to toddjordan/ember.js that referenced this pull request Sep 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants