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

PR 53 reverts PR 46 #55

Closed
shpros opened this issue Jun 2, 2015 · 5 comments
Closed

PR 53 reverts PR 46 #55

shpros opened this issue Jun 2, 2015 · 5 comments

Comments

@shpros
Copy link

shpros commented Jun 2, 2015

#46 was merged into mainline, but the merge of #53 reverted those changes. Intentional, or bad merge conflict? #46 was a fix for #45, which is mentioned in the changelog for 1.0.2.
@ghost
Copy link

ghost commented Jun 3, 2015

will investigate

@shipunyc
Copy link
Contributor

shipunyc commented Jun 3, 2015

I will reapply #46

@ghost
Copy link

ghost commented Jun 3, 2015

turns out our internal source repository was out of sync with GitHub repo. our mistake. sorry about that.

@shpros
Copy link
Author

shpros commented Jun 3, 2015

Thanks for re-applying. Also thanks for fixing "occured" -- that one was driving me nuts but I didn't want to make that change in a totally unrelated PR.

@ghost
Copy link

ghost commented Jun 4, 2015

this has been fixed. 1.0.3 pushed to npm.

@ghost ghost closed this as completed Jun 4, 2015
This issue was closed.
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
2 participants
@shpros @shipunyc