冲突

2024-04-23 23:26:13 +08:00 · 2024-04-23 23:26:13 +08:00 · 73066bf5e2
parent 639766c0f9
commit 73066bf5e2
1 changed files with 0 additions and 30 deletions
--- a/src/pages.json
+++ b/src/pages.json
@ -206,7 +206,6 @@
      ]
    },
    {
-<<<<<<< HEAD
      "root": "pages/ask-leave",
      "pages": [
        {
@ -219,41 +218,12 @@
          "path": "create",
          "style": {
            "navigationBarTitleText": "请假申请"
-=======
-      "root": "pages/train-books",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "培训课件"
->>>>>>> bef6694e8063f41c6890ee243e7b32e9f248c252
          }
        },
        {
          "path": "detail",
          "style": {
-<<<<<<< HEAD
            "navigationBarTitleText": "请假详情"
-=======
-            "navigationBarTitleText": "培训课件"
-          }
-        }
-      ]
-    },
-    {
-      "root": "pages/examination",
-      "pages": [
-        {
-          "path": "index",
-          "style": {
-            "navigationBarTitleText": "培训考试"
-          }
-        },
-        {
-          "path": "detail",
-          "style": {
-            "navigationBarTitleText": "培训考试"
->>>>>>> bef6694e8063f41c6890ee243e7b32e9f248c252
          }
        }
      ]