From 4e05459fe3ba6e56cdae3083c120b6e6b5e56258 Mon Sep 17 00:00:00 2001
From: xhhing <1370112271@qq.com>
Date: Sun, 27 Oct 2024 23:08:03 +0800
Subject: [PATCH] add: update pages.json

---
 pages.json | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/pages.json b/pages.json
index 39dec93..dcbb738 100644
--- a/pages.json
+++ b/pages.json
@@ -24,7 +24,12 @@
         "navigationStyle": "custom"
       }
     },
-<<<<<<< HEAD
+    {
+      "path": "pages/transition/page5/page5",
+      "style": {
+        "navigationStyle": "custom"
+      }
+    },
     {
       "path": "pages/login/account_login/account_login",
       "style": {
@@ -37,14 +42,6 @@
         "navigationStyle": "custom"
       }
     }
-=======
-	{
-	  "path": "pages/transition/page5/page5",
-	  "style": {
-	    "navigationStyle": "custom"
-	  }
-	}
->>>>>>> 0732be076c754b7bef85e899635ba6fdff55aa31
   ],
   "uniIdRouter": {},
   "tabBar": null