Skip to content

Commit 8d9a3f4

Browse files
authored
docs: resolve merge conflict in docs-contributors.md
1 parent 61065d7 commit 8d9a3f4

File tree

1 file changed

+1
-15
lines changed

1 file changed

+1
-15
lines changed

src/content/community/docs-contributors.md

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,8 @@ React 문서는 [React 팀](/community/team)과 [외부 기여자](https://githu
1010

1111
## 내용 {/*content*/}
1212

13-
<<<<<<< HEAD
1413
* [Rachel Nabors](https://twitter.com/RachelNabors): 편집, 글쓰기, 그림 그리기
15-
* [Dan Abramov](https://twitter.com/dan_abramov): 글쓰기, 커리큘럼 설계
14+
* [Dan Abramov](https://bsky.app/profile/danabra.mov): 글쓰기, 커리큘럼 설계
1615
* [Sylwia Vargas](https://twitter.com/SylwiaVargas): 예시 코드
1716
* [Rick Hanlon](https://twitter.com/rickhanlonii): 글쓰기
1817
* [David McCabe](https://twitter.com/mcc_abe): 글쓰기
@@ -22,19 +21,6 @@ React 문서는 [React 팀](/community/team)과 [외부 기여자](https://githu
2221
* [Matt Carroll](https://twitter.com/mattcarrollcode): 편집, 글쓰기
2322
* [Natalia Tepluhina](https://twitter.com/n_tepluhina): 리뷰, 조언
2423
* [Sebastian Markbåge](https://twitter.com/sebmarkbage): 피드백
25-
=======
26-
* [Rachel Nabors](https://twitter.com/RachelNabors): editing, writing, illustrating
27-
* [Dan Abramov](https://bsky.app/profile/danabra.mov): writing, curriculum design
28-
* [Sylwia Vargas](https://twitter.com/SylwiaVargas): example code
29-
* [Rick Hanlon](https://twitter.com/rickhanlonii): writing
30-
* [David McCabe](https://twitter.com/mcc_abe): writing
31-
* [Sophie Alpert](https://twitter.com/sophiebits): writing
32-
* [Pete Hunt](https://twitter.com/floydophone): writing
33-
* [Andrew Clark](https://twitter.com/acdlite): writing
34-
* [Matt Carroll](https://twitter.com/mattcarrollcode): editing, writing
35-
* [Natalia Tepluhina](https://twitter.com/n_tepluhina): reviews, advice
36-
* [Sebastian Markbåge](https://twitter.com/sebmarkbage): feedback
37-
>>>>>>> b22cbc3fed310b39c99fdd0f01621ac1903d1e8e
3824

3925
## 디자인 {/*design*/}
4026

0 commit comments

Comments
 (0)