add: update pages.json

1 month ago · 4e05459fe3
parent 49d23dc820
commit 4e05459fe3
1 changed files with 6 additions and 9 deletions
--- 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