This repository was archived by the owner on Jun 18, 2024. It is now read-only.
Resolve merge conflicts #134
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* Conflicts arose as a result of a bad merge in cc7ccd2 * Props @jpmckinney for catching it
Closed
|
Looks good! Sorry for pestering :) |
|
👍 on this, but all additional schema.md changes should be encompassed in #44 so we can have one single pull request for internal approval. Thanks Ben and @jpmckinney |
|
@MarinaMartin right, but master now has merge conflicts that's going to make #44 hard to merge. 😄 This should theoretically put master in line with the master #44 is branched off of. |
|
@benbalter I'm fine any which way, but I already made these changes in #44 last night, too. @haleyvandyck I'd accept this one when you can so we don't have a glaring HEAD error out there :) |
|
Sorry for the delay on this... thanks guys. |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #131.
See #57 (comment)