diff options
Diffstat (limited to 'config.yml')
| -rw-r--r-- | config.yml | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/config.yml b/config.yml index 8339da0..1a4f81d 100644 --- a/config.yml +++ b/config.yml @@ -1,6 +1,10 @@ # logging verbosity leve (1-7) 1=panic, 7=trace verbose: +<<<<<<< HEAD level: 7 +======= + level: 6 +>>>>>>> refs/remotes/origin/master # Host information (ip to bind to and port to listen on) server: @@ -9,7 +13,11 @@ server: # The database that should be accessed db: +<<<<<<< HEAD addr: "localhost:5432" +======= + addr: "postgres:5432" +>>>>>>> refs/remotes/origin/master user: "postgres" password: "postgres" database: "postgres" |
