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.

Sign up for GitHub

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

Jump to bottom

Merge conflicts in release build #223

Closed
bjornbytes opened this issue Apr 24, 2017 · 2 comments
Closed

Merge conflicts in release build #223

bjornbytes opened this issue Apr 24, 2017 · 2 comments

Comments

@bjornbytes
Copy link

It looks like some merge conflicts snuck in to webvr-polyfill.min.js.
@cvan
Copy link
Contributor

cvan commented May 3, 2017

Thanks for filing! I opened PR #225 to fix the builds (I think a manual merge conflict caused this). See my comment here about automating this in the future.

@jsantell
Copy link
Contributor

Closed via #233

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

No branches or pull requests
3 participants
@cvan @jsantell @bjornbytes