8000 Fix merge conflict with PR778 by anthrotype · Pull Request #779 · fonttools/fonttools · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix merge conflict with PR778 #779

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

Merged
merged 4 commits into from
Dec 20, 2016
Merged

Fix merge conflict with PR778 #779

merged 4 commits into from
Dec 20, 2016

Conversation

anthrotype
Copy link
Member

@mhosken please take a look, thanks

@mhosken
Copy link
Contributor
mhosken commented Dec 20, 2016

Looks good. Let's run with it.
Thanks for your help.

@anthrotype anthrotype merged commit 638e36a into master Dec 20, 2016
@anthrotype anthrotype deleted the fix-pr-778 branch December 20, 2016 13:25
@anthrotype anthrotype mentioned this pull request Dec 20, 2016
@anthrotype
Copy link
Member Author

No, thank you!

oh, I added a minor thing for omitted class definitions in GDEF:
f147398

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
0