Browse Source

Fix conflict

André Peters 7 years ago
parent
commit
280431f98d
1 changed files with 0 additions and 4 deletions
  1. 0 4
      docker-compose.yml

+ 0 - 4
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