Fixing merge conflicts

This commit is contained in:
Chris Troutner
2022-06-29 16:29:28 -07:00
19 changed files with 13437 additions and 14495 deletions
+1 -1
View File
@@ -1,6 +1,6 @@
const common = require('./env/common')
const env = process.env.BCH_ENV || 'development'
const env = process.env.BCH_DEX || 'development'
const config = require(`./env/${env}`)
module.exports = Object.assign({}, common, config)