Skip to content

Commit 8442d2a

Browse files
committed
Resolve merge conflict
Related to 9932845, e560f8a
1 parent acbda33 commit 8442d2a

File tree

1 file changed

+17
-63
lines changed

1 file changed

+17
-63
lines changed

content/docs/nav.yml

Lines changed: 17 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,10 @@
77
- id: create-a-new-react-app
88
title: 새로운 React 앱 만들기
99
- id: cdn-links
10-
<<<<<<< HEAD
1110
title: CDN 링크
12-
- title: 주요 개념
13-
=======
14-
title: CDN Links
1511
- id: release-channels
16-
title: Release Channels
17-
- title: Main Concepts
18-
>>>>>>> 081bb31226919062938ef924472ba1b4170facfc
12+
title: 배포 채널
13+
- title: 주요 개념
1914
isOrdered: true
2015
items:
2116
- id: hello-world
@@ -112,49 +107,26 @@
112107
- id: javascript-environment-requirements
113108
title: JS 환경 요구사항
114109
- id: glossary
115-
<<<<<<< HEAD
116110
title: React 기술 용어 모음
117-
- title: Hook (New)
118-
isOrdered: true
119-
items:
120-
- id: hooks-intro
121-
title: Hook 소개
122-
- id: hooks-overview
123-
title: Hook 개요
124-
- id: hooks-state
125-
title: State Hook 사용하기
126-
- id: hooks-effect
127-
title: Effect Hook 사용하기
128-
- id: hooks-rules
129-
title: Hook 규칙
130-
- id: hooks-custom
131-
title: 자신만의 Hook 만들기
132-
- id: hooks-reference
133-
title: Hook API 참고서
134-
- id: hooks-faq
135-
title: Hook 자주 묻는 질문
136-
=======
137-
title: Glossary
138-
- title: Hooks
111+
- title: Hook
139112
isOrdered: true
140113
items:
141114
- id: hooks-intro
142-
title: Introducing Hooks
115+
title: Hook 소개
143116
- id: hooks-overview
144-
title: Hooks at a Glance
117+
title: Hook 개요
145118
- id: hooks-state
146-
title: Using the State Hook
119+
title: State Hook 사용하기
147120
- id: hooks-effect
148-
title: Using the Effect Hook
121+
title: Effect Hook 사용하기
149122
- id: hooks-rules
150-
title: Rules of Hooks
123+
title: Hook 규칙
151124
- id: hooks-custom
152-
title: Building Your Own Hooks
125+
title: 자신만의 Hook 만들기
153126
- id: hooks-reference
154-
title: Hooks API Reference
127+
title: Hook API 참고서
155128
- id: hooks-faq
156-
title: Hooks FAQ
157-
>>>>>>> 081bb31226919062938ef924472ba1b4170facfc
129+
title: Hook 자주 묻는 질문
158130
- title: Testing
159131
items:
160132
- id: testing
@@ -163,19 +135,6 @@
163135
title: Testing Recipes
164136
- id: testing-environments
165137
title: Testing Environments
166-
<<<<<<< HEAD
167-
- title: 기여
168-
items:
169-
- id: how-to-contribute
170-
title: 기여하는 방법
171-
- id: codebase-overview
172-
title: 코드 구조 개요
173-
- id: implementation-notes
174-
title: 구현 참고사항
175-
- id: design-principles
176-
title: 설계 원칙
177-
- title: 자주 묻는 질문
178-
=======
179138
- title: Concurrent Mode (Experimental)
180139
isOrdered: true
181140
items:
@@ -189,18 +148,17 @@
189148
title: Adopting Concurrent Mode
190149
- id: concurrent-mode-reference
191150
title: Concurrent Mode API Reference
192-
- title: Contributing
151+
- title: 기여
193152
items:
194153
- id: how-to-contribute
195-
title: How to Contribute
154+
title: 기여하는 방법
196155
- id: codebase-overview
197-
title: Codebase Overview
156+
title: 코드 구조 개요
198157
- id: implementation-notes
199-
title: Implementation Notes
158+
title: 구현 참고사항
200159
- id: design-principles
201-
title: Design Principles
202-
- title: FAQ
203-
>>>>>>> 081bb31226919062938ef924472ba1b4170facfc
160+
title: 설계 원칙
161+
- title: 자주 묻는 질문
204162
items:
205163
- id: faq-ajax
206164
title: AJAX와 API
@@ -217,8 +175,4 @@
217175
- id: faq-versioning
218176
title: 버전 정책
219177
- id: faq-internals
220-
<<<<<<< HEAD
221178
title: 가상 DOM과 구현 세부사항
222-
=======
223-
title: Virtual DOM and Internals
224-
>>>>>>> 081bb31226919062938ef924472ba1b4170facfc

0 commit comments

Comments
 (0)