fix

66c704c2 · JaxBBLL · 1b17254f · 66c704c2 · 66c704c2
--- a/App.vue
+++ b/App.vue
--- a/pages.json
+++ b/pages.json
@@ -87,21 +87,12 @@
      "style": {
        "navigationBarTitleText": ""
      }
-<<<<<<< HEAD
-=======
-    },
-    {
-      "path": "api/api",
-      "style": {
-        "navigationBarTitleText": ""
-      }
    },
    {
      "path": "pages/test/index",
      "style": {
        "navigationBarTitleText": ""
      }
->>>>>>> master
    }
    // {
    // 	"path" : "api/api",