Sync with reactjs.org @ 957f0b3a #137
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
This is both widely recommended as the preferred style and also that in which actual commit messages on this project are written.
* Add canonical url to the head * Renaming ogUrl to canonicalUrl * Changing home page canonical url * Rename the createOgUrl.js file to createCanonicalUrl.js * Updating ogUrl name and usage (now canonicalUrl) * Add canonicalUrl to TitleAndMetaTags component on pages where it was missing * Adding missing trailing slashes * Remove deprecated link to React FAQ webpage
|
Deploy preview for ko-reactjs-org ready! Built with commit 37442ae |
taehwanno
reviewed
Jun 5, 2019
README.md
Outdated
| 1. `git add -A && git commit -m "My message"` (`My message` 부분을 `Fixed header logo on Android` 같은 커밋 메시지로 교체)를 실행하여 변경한 파일들을 commit 해주세요. | ||
| ======= | ||
| 1. `git add -A && git commit -m "My message"` (replacing `My message` with a commit message, such as `Fix header logo on Android`) to stage and commit your changes | ||
| >>>>>>> 957f0b3a4067a9ba46d1ffda898658925ffa0549 |
Related to ca9dc1c
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.
This PR was automatically generated.
Merge changes from reactjs.org at 957f0b3
The following files have conflicts and may need new translations:
Please fix the conflicts by pushing new commits to this pull request, either by editing the files directly on GitHub or by checking out this branch.
DO NOT SQUASH MERGE THIS PULL REQUEST!
Doing so will "erase" the commits from master and cause them to show up as conflicts the next time we merge.