Skip to content

Commit 83a8c1d

Browse files
authored
fix the confilict
1 parent 34461d7 commit 83a8c1d

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

src/content/reference/react/use-client.md

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,9 @@ canary: true
44
---
55

66
<Canary>
7-
8-
<<<<<<< HEAD
97
هذه التوجيهات لازمة فقط إذا كنت [تستخدم RSC (مكونات الخادم)](/learn/start-a-new-react-project#bleeding-edge-react-frameworks) أو تبني مكتبة متوافقة معها.
108

11-
</Note>
12-
=======
13-
`'use client'` is needed only if you're [using React Server Components](/learn/start-a-new-react-project#bleeding-edge-react-frameworks) or building a library compatible with them.
149
</Canary>
15-
>>>>>>> 819518cfe32dd2db3b765410247c30feea713c77
1610

1711

1812
<Intro>

0 commit comments

Comments
 (0)