Skip to content

Conversation

chadhietala
Copy link
Contributor

No description provided.

@homu
Copy link
Contributor

homu commented May 12, 2016

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

@chadhietala
Copy link
Contributor Author

This is now dependent on tildeio/htmlbars#460. /cc @krisselden

@homu
Copy link
Contributor

homu commented May 13, 2016

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

@chadhietala
Copy link
Contributor Author

Merged as part of #13493

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.

2 participants