Correct conflicts for Masami #1
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
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Translated writing data - r-novice-gapminder
…er/writing-data Revert "Translated writing data - r-novice-gapminder"
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
Co-Authored-By: masamiy <[email protected]>
This appears to have been copied inadvertently
Rkmkk edit revise
…h 'master' and resolve conflicts
|
I clicked green'merge' button. |
|
That's the one! These changes are added to your PR: swcarpentry-ja#114 This should put all the updates together so we can compare your changes to the latest version. Don't worry, I've had to do this for others as well. |
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.
Enables PR swcarpentry-ja#114 to merge. This adds all recent changes to the "swcarpentry-ja" organisation "i18n" repository to your version so we can add your changes without "conflicts" (changes to the lines by both versions).