Skip to content

Commit 6ff11de

Browse files
committed
Resolve a conflict
1 parent 7e155a1 commit 6ff11de

File tree

1 file changed

+0
-4
lines changed

1 file changed

+0
-4
lines changed

content/docs/nav.yml

-4
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,9 @@
5858
- id: optimizing-performance
5959
title: パフォーマンス最適化
6060
- id: portals
61-
<<<<<<< HEAD
6261
title: ポータル
63-
=======
64-
title: Portals
6562
- id: profiler
6663
title: Profiler
67-
>>>>>>> ddbd064d41d719f9ec0c2f6a4227f797a5828310
6864
- id: react-without-es6
6965
title: ES6 なしで React を使う
7066
- id: react-without-jsx

0 commit comments

Comments
 (0)