Resolve conflict in config/database.yml.postgresql

Signed-off-by: Rémy Coutable <remy@rymai.me>

Resolve conflict in config/database.yml.postgresql
Signed-off-by: Rémy Coutable <remy@rymai.me>
0b5ee5a9 · Rémy Coutable · a7361354 · 0b5ee5a9
Commit 0b5ee5a9 authored Oct 18, 2017 by Rémy Coutable
Show whitespace changes
Inline Side-by-side

Showing with 3 additions and 10 deletions

config/database.yml.postgresql config/database.yml.postgresql +3 -10

No files found.
--- a/config/database.yml.postgresql
+++ b/config/database.yml.postgresql
@@ -6,20 +6,13 @@ production:
  encoding: unicode
  database: gitlabhq_production
  pool: 10
-<<<<<<< HEAD
+  username: git
-  # username: git
+  password: "secure password"
-  # password:
+  host: localhost
-  # host: localhost
-  # port: 5432
  # load_balancing:
  #   hosts:
  #     - host1.example.com
  #     - host2.example.com
-=======
-  username: git
-  password: "secure password"
-  host: localhost
->>>>>>> upstream/master
 #
 # Development specific