合并冲突

2025-06-20 18:17:47 +08:00
parent 9780bfe021
commit f08a683f7c
1 changed files with 0 additions and 6 deletions
@@ -10,7 +10,6 @@
            }
        },
        {
-<<<<<<< HEAD
            "path": "pages/courseDetail/index",
            "style": {
                "navigationBarTitleText": "课程详情",
@@ -20,8 +19,6 @@
            }
        },
        {
-=======
->>>>>>> f0015d5ea46c4904ce35c5ec4a03028d9ec6d5b4
            "path": "pages/study/index",
            "style": {
                "navigationBarTitleText": "学习",
@@ -93,8 +90,6 @@
                    "titleNView": false
                }
            }
-<<<<<<< HEAD
-=======
        },
        {
            "path": "pages/course/index",
@@ -104,7 +99,6 @@
                    "titleNView": false
                }
            }
->>>>>>> f0015d5ea46c4904ce35c5ec4a03028d9ec6d5b4
        }
    ],
    "tabBar": {