解决translate配置冲突

lua-ui/config/pinjamancepat-credit-review-ui.js

@@ -2,13 +2,8 @@ const protocol = window.location.protocol
 const qiniuHost = 'https://oic74zs8j.qnssl.com/'
 // const opapiHost = 'http://192.168.29.39:9012' //开发环境
 const opapiHost = 'http://pinja-cr-api-dongmeifeng.q-gp.com' //测试环境
-<<<<<<< Updated upstream
-const translateHost = 'http://192.168.165.155:12001' //开发环境 本地起
-// const translateHost = 'http://192.168.166.187:12001' //测试环境环境
-=======
 // const translateHost = 'http://192.168.165.177:12001' //开发环境 本地起
 const translateHost = 'http://translate-dongmeifeng.q-gp.com' //测试环境环境
->>>>>>> Stashed changes
 let LoginUrl = `${protocol}#/login`  // 登录页
 let domain = ''