Fix conflict

2018-02-17 08:51:09 +01:00 · 2018-02-17 08:51:09 +01:00 · 280431f98d
commit 280431f98d
parent 1f09544f32
1 changed files with 0 additions and 4 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@ -165,11 +165,7 @@ services:
            - sogo

    dovecot-mailcow:
-<<<<<<< HEAD
-      image: mailcow/dovecot:1.21
-=======
      image: mailcow/dovecot:1.22
->>>>>>> master
      build: ./data/Dockerfiles/dovecot
      cap_add:
        - NET_BIND_SERVICE