This repository has been archived by the owner on Mar 26, 2021. It is now read-only.
Update: Added Support for Multiple Author Pulls #2
Closed
Conversation
This file contains 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
…this site so not to create multiple drafts.
aschweigert
added a commit
that referenced
this pull request
Jun 27, 2016
Docs Updates to fix image paths
benlk
suggested changes
Nov 9, 2017
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This PR has merge conflicts committed in it.
|
||
} | ||
|
||
>>>>>>> 87408f651d1506ce23c38027d7a13cedc925b012 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This marks the end of a merge conflict that began on line 159.
NPR_MULTI_BYLINE_META_KEY => $multi_by_line, | ||
======= | ||
NPR_MULTI_BYLINE_META_KEY => $multi_by_line, | ||
>>>>>>> 87408f651d1506ce23c38027d7a13cedc925b012 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is a merge conflict that needs to be removed.
Nearly 5 years old. Another PR can be opened in the future if this feature is still desired. |
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.
Adds a new custom field that holds a delimited string that is constructed when multiple bylines are present. Single bylines are still stored in the same fashion.