From f08a683f7cd25acece9d453e11dec87b0e48f091 Mon Sep 17 00:00:00 2001
From: yanghang <icho.yang@scai-global.com>
Date: Fri, 20 Jun 2025 18:17:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages.json | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pages.json b/src/pages.json
index a1259033..d3155b84 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -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": {