chore: fix merge conflicts

Chia-Network · Dec 7, 2021 · f3ecee8 · f3ecee8
2 parents 1750631 + 12223d0
commit f3ecee8
Show file tree

Hide file tree

Showing 20 changed files with 13,194 additions and 289 deletions.
diff --git a/.sequelizerc b/.sequelizerc
@@ -1,7 +1,7 @@
 var path = require('path');
 
 module.exports = {
-  config: path.resolve('src', 'config', 'database.json'),
+  config: path.resolve('src', 'config', 'config.json'),
   'migrations-path': path.resolve('migrations'),
   'models-path': path.resolve('src', 'models'),
   'seeders-path': path.resolve('seeders'),

diff --git a/config/config.json b/config/config.json
diff --git a/config/database.json b/config/database.json
diff --git a/migrations/20211207145446-staging.js → migrations/20211207145446-staging.cjs b/migrations/20211207145446-staging.js → migrations/20211207145446-staging.cjs