fix: resolve conflict

reactjs · Mar 19, 2024 · 44af67f · 44af67f
1 parent 16020b6
commit 44af67f
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/sidebarReference.json b/src/sidebarReference.json
@@ -352,10 +352,7 @@
     },
     {
       "hasSectionHeader": true,
-<<<<<<< HEAD
-      "sectionHeader": "过时的 API"
-=======
-      "sectionHeader": "Rules of React"
+      "sectionHeader": "React 规则"
     },
     {
       "title": "Overview",
@@ -375,8 +372,7 @@
     },
     {
       "hasSectionHeader": true,
-      "sectionHeader": "Legacy APIs"
->>>>>>> f55d9487c6648570fc80f1421d7dca0a3b9b94b6
+      "sectionHeader": "过时的 API"
     },
     {
       "title": "过时的 React API",