Fix conflict

2018-02-16 22:44:02 +01:00
parent 0bfd0838c2 2a3040de12
commit 1f09544f32
13 changed files with 60 additions and 21 deletions
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -142,7 +142,7 @@ services:
            - phpfpm

    sogo-mailcow:
-      image: mailcow/sogo:1.16
+      image: mailcow/sogo:1.17
      build: ./data/Dockerfiles/sogo
      environment:
        - DBNAME=${DBNAME}
@@ -165,7 +165,11 @@ 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