Skip to content

Commit 67c8b47

Browse files
committed
docs: resolve RSC reference conflicts
1 parent bc605d1 commit 67c8b47

File tree

2 files changed

+31
-137
lines changed

2 files changed

+31
-137
lines changed

src/content/reference/rsc/directives.md

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,10 @@
11
---
2-
<<<<<<< HEAD
3-
title: "Direktif"
4-
canary: true
5-
=======
6-
title: Directives
7-
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
2+
title: Direktif
83
---
94

105
<RSC>
116

12-
<<<<<<< HEAD
13-
Direktif ini diperlukan hanya jika Anda [menggunakan React Server Components](/learn/start-a-new-react-project#bleeding-edge-react-frameworks) atau membangun pustaka yang kompatibel dengannya.
14-
=======
15-
Directives are for use in [React Server Components](/reference/rsc/server-components).
16-
>>>>>>> 50d6991ca6652f4bc4c985cf0c0e593864f2cc91
7+
Direktif digunakan di [Komponen Server React](/reference/rsc/server-components).
178

189
</RSC>
1910

0 commit comments

Comments
 (0)