Skip to content

Commit 065a440

Browse files
chore: resolve conflict
Signed-off-by: Jie Peng <[email protected]>
1 parent 9e784da commit 065a440

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

src/sidebarLearn.json

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,11 @@
3737
"path": "/learn/editor-setup"
3838
},
3939
{
40-
<<<<<<< HEAD
41-
"title": "React 開發者工具",
42-
=======
43-
"title": "Using TypeScript",
40+
"title": "使用 TypeScript",
4441
"path": "/learn/typescript"
4542
},
4643
{
47-
"title": "React Developer Tools",
48-
>>>>>>> 842c24c9aefaa60b7ae9b46b002bd1b3cf4d31f3
44+
"title": "React 開發者工具",
4945
"path": "/learn/react-developer-tools"
5046
}
5147
]

0 commit comments

Comments
 (0)