chore: C01 conflict 해결#1848
Open
dohy-eon wants to merge 1 commit into
Open
Conversation
|
|
|
|
||
| This is called the "Same Origin Policy". To work around that, *both pages* must agree for data exchange and must contain special JavaScript code that handles it. We'll cover that in the tutorial. | ||
|
|
||
| This limitation is, again, for the user's safety. A page from `http://anysite.com` which a user has opened must not be able to access another browser tab with the URL `http://gmail.com`, for example, and steal information from there. |
Author
There was a problem hiding this comment.
리뷰 감사합니다 (_ _)
혹시 해당 PR은 충돌 마커 해결 작업만 진행하는 방향으로 작업 마쳤는데 영문 → 한글 번역 및 문장 수정 작업도 함께 진행하는 걸까요??
Contributor
There was a problem hiding this comment.
헉 죄송합니다. 충돌마크 "만" 해결인데 제가 잘못봤네요ㅠㅠ
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
요약
upstream 동기화 과정에서 발생한 머지 충돌 마커를 정리했습니다.
대상 디렉터리:
1-js/01-getting-started,1-js/13-modules<<<<<<<,=======,>>>>>>>)을 모두 제거했습니다.변경 파일 (6개)
1-js/01-getting-started/1-intro/article.md— 충돌 10개 정리2-manuals-specifications/article.md— 충돌 5개 정리3-code-editors/article.md— 충돌 3개 정리4-devtools/article.md— 충돌 1개 정리1-js/13-modules/01-modules-intro/article.md— 충돌 14개 정리02-import-export/article.md— 충돌 11개 정리총 44개 충돌 블록 / 331줄 정리 완료.
연관 이슈
Pull Request 체크리스트
TODO
chore: C01 conflict 해결