Skip to content
Permalink
Browse files

Merge conflict

  • Loading branch information...
Lemmmy committed Jan 19, 2019
2 parents 6a1f04d + 493464b commit 214633d8428f69ddc155600b9702b20c19f7823e
Showing with 2 additions and 2 deletions.
  1. +2 −2 config.example.js
@@ -13,7 +13,7 @@ config.databaseDB = 'example';
config.databaseUser = 'example';
// The password used to authenticate against the database
config.databasePass = 'example';
// The dialect used to connect, one of: mysql, postgres, mariadb or mssql.
// The dialect used to connect, one of: mysql, postgres, mariadb or mssql.
config.databaseDialect = 'mysql';

/*
@@ -91,4 +91,4 @@ config.badgeVerifiedServers = [
// Temporary while developing
config.websocketsEnabled = true;

module.exports = config;
module.exports = config;

0 comments on commit 214633d

Please sign in to comment.
You can’t perform that action at this time.