fixed conflicts for merging
This commit is contained in:
commit
d5f752ce5f
4 changed files with 29 additions and 28 deletions
devConfig
|
@ -1,4 +1,4 @@
|
|||
module.exports = {
|
||||
const sequelizeCliConfig = {
|
||||
development: {
|
||||
username: '',
|
||||
password: '',
|
||||
|
@ -21,3 +21,5 @@ module.exports = {
|
|||
dialect : 'mysql',
|
||||
},
|
||||
};
|
||||
|
||||
module.exports = sequelizeCliConfig;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue