Skip to content

Conversation

@johnmhoran
Copy link
Member

Reference: #593

- Fix merge conflicts.
Reference: #593
Signed-off-by: johnmhoran <[email protected]>
Reference: #593
Signed-off-by: johnmhoran <[email protected]>
@johnmhoran
Copy link
Member Author

@pombredanne @mjherzog I've fixed the various merge conflicts and lowercased all the MAYs and MUSTs etc etc and this PR #612 and its parent issue #593 are once again ready for review, approval and prompt merge.

There was one usage of MUST instead of must to correct
Copy link
Member

@mjherzog mjherzog left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I reviewed the changes and fixed one case of "MUST" to correct to "must" on line 16 of docs/known-qualifiers.md

@johnmhoran
Copy link
Member Author

Thanks for catching that @mjherzog -- merge conflict is useless when it comes to comparing a change in casing and did not highlight that diff.

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.

3 participants