diff options
Diffstat (limited to 'config.yml')
| -rw-r--r-- | config.yml | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/config.yml b/config.yml index 1a4f81d..e477a16 100644 --- a/config.yml +++ b/config.yml @@ -1,10 +1,6 @@ # 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: @@ -13,11 +9,7 @@ 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" @@ -27,4 +19,4 @@ frontend: true # the path at which the uploaded slides are stored # (trailing slash expected) -uploadpath: "./uploads/" \ No newline at end of file +uploadpath: "./uploads/" |
