From ee194e16a53ec6a4079bd1b2502b2a1a103c99d7 Mon Sep 17 00:00:00 2001
From: les <lesion@autistici.org>
Date: Wed, 4 Nov 2020 09:30:06 +0100
Subject: [PATCH] minor

---
 docs/docker/postgres/docker-compose.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docs/docker/postgres/docker-compose.yml b/docs/docker/postgres/docker-compose.yml
index ad86a9f4..664bd894 100644
--- 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