Skip to content

Commit 42ca516

Browse files
committed
Fix sidebarReference.json conflict
1 parent ee29f08 commit 42ca516

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/sidebarReference.json

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -171,9 +171,6 @@
171171
"sectionHeader": "react-dom@18.2.0"
172172
},
173173
{
174-
<<<<<<< HEAD
175-
"title": "المكونات",
176-
=======
177174
"title": "Hooks",
178175
"path": "/reference/react-dom/hooks",
179176
"routes": [
@@ -190,8 +187,7 @@
190187
]
191188
},
192189
{
193-
"title": "Components",
194-
>>>>>>> fcd00068bd1bdd4eb37e3e0ab0488a9d093670bc
190+
"title": "المكونات",
195191
"path": "/reference/react-dom/components",
196192
"routes": [
197193
{

0 commit comments

Comments
 (0)