minor

2020-11-04 09:30:06 +01:00
parent 7b19319866
commit ee194e16a5
1 changed files with 0 additions and 4 deletions
--- a/docs/docker/postgres/docker-compose.yml
+++ b/docs/docker/postgres/docker-compose.yml
@@ -29,8 +29,4 @@ services:
    depends_on:
        - db
    ports:
-<<<<<<< HEAD
-      - "127.0.0.1:13120:13120"
-=======
      - 127.0.0.1:13120:13120
->>>>>>> master