Skip to content

Commit ab69546

Browse files
committed
fix: resolve conflict
1 parent 9cbb1f1 commit ab69546

File tree

3 files changed

+0
-14
lines changed

3 files changed

+0
-14
lines changed

src/sidebarBlog.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
"path": "/blog/2025/04/23/react-labs-view-transitions-activity-and-more"
3434
},
3535
{
36-
<<<<<<< HEAD
3736
"title": "React Compiler RC",
3837
"titleForHomepage": "React Compiler RC",
3938
"icon": "blog",
@@ -42,9 +41,6 @@
4241
},
4342
{
4443
"title": "Create React App 지원 종료",
45-
=======
46-
"title": "Sunsetting Create React App",
47-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
4844
"titleForHomepage": "Sunsetting Create React App",
4945
"icon": "blog",
5046
"date": "February 14, 2025",

src/sidebarHome.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,6 @@
8484
},
8585
{
8686
"hasSectionHeader": true,
87-
<<<<<<< HEAD
88-
"sectionHeader": "참여하기"
89-
=======
9087
"sectionHeader": "REACT COMPILER API"
9188
},
9289
{
@@ -104,7 +101,6 @@
104101
{
105102
"hasSectionHeader": true,
106103
"sectionHeader": "GET INVOLVED"
107-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
108104
},
109105
{
110106
"title": "React 커뮤니티",

src/sidebarLearn.json

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,11 +66,6 @@
6666
"path": "/learn/react-compiler/introduction"
6767
},
6868
{
69-
<<<<<<< HEAD
70-
"title": "React 컴파일러",
71-
"path": "/learn/react-compiler",
72-
"canary": true
73-
=======
7469
"title": "Installation",
7570
"path": "/learn/react-compiler/installation"
7671
},
@@ -81,7 +76,6 @@
8176
{
8277
"title": "Debugging and Troubleshooting",
8378
"path": "/learn/react-compiler/debugging"
84-
>>>>>>> 0d05d9b6ef0f115ec0b96a2726ab0699a9ebafe1
8579
}
8680
]
8781
},

0 commit comments

Comments
 (0)