Finish resolve 14.0.0 merge conflicts #967
Merged
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
Original commit: 771a9f3#diff-9356b5fb91b656dac1f038e8d9a84ed3 Got lost while resolving a merge commit.
|
This pull request is being automatically deployed with ZEIT Now (learn more). 🔍 Inspect: https://zeit.co/primer/primer-css/2s1k84nti |
shawnbot
approved these changes
Oct 31, 2019
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Sorry... 😩 I tried to rebase
masteronrelease-14.0.0to get the changes fromrelease-13.2.0. But there were some merge conflicts and I think I missed the changes from this commit: 771a9f3So in this PR I tried to add them back. Did I get that right?
script/dist.jsgot changes inrelease-14.0.0through this PR: #952