Skip to content

Commit 44b4a7f

Browse files
committed
docs: resolve conflict in directives.md
1 parent e27c132 commit 44b4a7f

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

src/content/reference/rsc/directives.md

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
---
2-
<<<<<<< HEAD
32
title: "지시어"
4-
canary: true
5-
=======
6-
title: Directives
7-
>>>>>>> b1a249d597016c6584e4c186daa28b180cc9aafc
83
---
94

105
<RSC>
116

12-
<<<<<<< HEAD
13-
이 지시어는 [React 서버 컴포넌트를 사용하거나](/learn/start-a-new-react-project#bleeding-edge-react-frameworks) 이와 호환되는 라이브러리를 빌드하는 경우에만 필요합니다.
14-
=======
157
Directives are for use in [React Server Components](/learn/start-a-new-react-project#bleeding-edge-react-frameworks).
16-
>>>>>>> b1a249d597016c6584e4c186daa28b180cc9aafc
178

189
</RSC>
1910

0 commit comments

Comments
 (0)