Skip to content

Q
qahome-diamond
Commit baa99654 authored by 贾克伟's avatar 贾克伟
Browse files
Options

解决冲突

parent 3c9e29f0
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 6 deletions
config/dev.env.js
View file @ baa99654
module.exports = { module.exports = {
NODE_ENV: '"development"', NODE_ENV: '"development"',
ENV_CONFIG: '"dev"', 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"', QA_API: '"http://172.30.220.22:3003"',
TESTDATA_API: '"http://172.30.220.22:3333"', TESTDATA_API: '"http://172.30.220.22:3333"',
PIPELINE_API:'"http://pipes.liangkebang.com"' PIPELINE_API:'"http://pipes.liangkebang.com"'
>>>>>>> 3ddbb2ab59336f294225cb0086bf11e409375730
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment