edit

package/manage/config.js

@@ -11,13 +11,8 @@ if (location.port == '15000') {
 deverConfig = {
   // 一些基本配置，定义后台title
   setting: {
-<<<<<<< HEAD
     title: '源代宝',
     tokenTableName: 'dever-yuandaibao',
-=======
-    title: 'API充值系统',
-    tokenTableName: 'dever-admin-sign',
->>>>>>> a4cc3265f21ed07e8c85f55dc31aaeadf6957ded
     //loginParam: { system: 'group', number: 'default' },
   },
   // 网络配置