fix merge err

config/api.js

@@ -17,7 +17,6 @@ const $api = {
     update: {
       method: 'PUT',
       url: `${BaseAPIURl}wx/user`
-<<<<<<< HEAD
     },
     appointment: {
       method: 'GET',
@@ -30,8 +29,6 @@ const $api = {
     building: {
       method: 'GET',
       url: `${BaseAPIURl}wx/collection/:openid`
-=======
->>>>>>> 5c1f000d3d23edddccfbdceb0974cdc69e7bd0ce
     }
   },
   dict: {