紧急修复

pages.json

@@ -39,15 +39,9 @@
   }, {
     "path": "pages/mine/info/index",
     "style": {
-<<<<<<< .mine
       "navigationBarTitleText": "账号信息",
       "navigationStyle": "custom",
       "navigationBarBackgroundColor": "transparent"
-=======
-      "navigationBarTitleText": "个人信息",
-      "navigationStyle": "custom"
-
->>>>>>> .theirs
     }
   }, {
     "path": "pages/mine/info/edit",