解决冲突

baa99654 · 贾克伟 · 3c9e29f0 · baa99654
Commit baa99654 authored Mar 13, 2019 by 贾克伟
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 6 deletions

dev.env.js config/dev.env.js +0 -6

No files found.
--- a/config/dev.env.js
+++ b/config/dev.env.js
 module.exports = {
  NODE_ENV: '"development"',
  ENV_CONFIG: '"dev"',
-<<<<<<< HEAD
-  // QA_API: '"http://172.30.220.22:3003"',
-  QA_API: '"http://127.0.0.1:3003"',
-  TESTDATA_API: '"http://172.30.220.22:3333"'
-=======
  QA_API: '"http://172.30.220.22:3003"',
  TESTDATA_API: '"http://172.30.220.22:3333"',
  PIPELINE_API:'"http://pipes.liangkebang.com"'
->>>>>>> 3ddbb2ab59336f294225cb0086bf11e409375730
 }