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.

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

Format code better in “map of corresponding features” table #37

Merged
merged 1 commit into from
Mar 30, 2020

Conversation

roryokane
Copy link
Contributor

Improves formatting of the map of corresponding features section.

Git will detect a merge conflict between this and the changes in PR #36, but don’t worry, it won’t be hard to resolve. The conflict is because they make changes to adjacent table rows, “empty statement” and “null pointer”. But these changes don’t affect each other, so you can just mark the conflicting lines as “include both”, with the “null pointer” row second. If you’d rather I do this, I can rebase this PR after you accept the other PR.

@timotheecour timotheecour merged commit e3f30c2 into timotheecour:master Mar 30, 2020
@timotheecour
Copy link
Owner

excellent thanks; instead, please rebase the other PR since there are comments to address

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