Skip to content

Commit ea4fc35

Browse files
committed
docs: resolve conflict in README.md
1 parent 5a46aaf commit ea4fc35

File tree

1 file changed

+0
-7
lines changed

1 file changed

+0
-7
lines changed

README.md

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,10 @@
2222
### 사전 준비
2323

2424
1. Git
25-
<<<<<<< HEAD
2625
1. Node: v16.8.0 이상의 모든 버전
2726
1. Yarn v1(`[email protected]`): [Yarn 설치 안내](https://yarnpkg.com/lang/en/docs/install/) 참고
2827
1. 포크<sup>Fork</sup>한 개인 저장소
2928
1. 로컬에 클론<sup>Clone</sup>한 [ko.react.dev 저장소](https://github.com/reactjs/ko.react.dev)
30-
=======
31-
1. Node: any version starting with v16.8.0 or greater
32-
1. Yarn: See [Yarn website for installation instructions](https://yarnpkg.com/lang/en/docs/install/)
33-
1. A fork of the repo (for any contributions)
34-
1. A clone of the [react.dev repo](https://github.com/reactjs/react.dev) on your local machine
35-
>>>>>>> b1a249d597016c6584e4c186daa28b180cc9aafc
3629

3730
### 설치
3831

0 commit comments

Comments
 (0)