10/28 合并错误修复

config/dev.env.js

@@ -3,11 +3,6 @@ var prodEnv = require('./prod.env')
 
 module.exports = merge(prodEnv, {
   NODE_ENV: '"development"',
-<<<<<<< HEAD
   // REQUEST_URI: "'https://api.shuimuai.com/'"
   REQUEST_URI: "'https://testapi.shuimuai.com/'"
-=======
-  REQUEST_URI: "'https://testapi.shuimuai.com/'"
-  // REQUEST_URI: "'https://testapi.shuimuai.com/'"
->>>>>>> e6e65e8acc06ca9c724e9a0df47929887f5bf0c0
 })