fixed conflicts for merging

This commit is contained in:
bill bittner 2018-04-17 12:57:53 -07:00
commit d5f752ce5f
4 changed files with 29 additions and 28 deletions

View file

@ -1,4 +1,4 @@
module.exports = {
const sequelizeCliConfig = {
development: {
username: '',
password: '',
@ -21,3 +21,5 @@ module.exports = {
dialect : 'mysql',
},
};
module.exports = sequelizeCliConfig;