paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix conflict

master
André Peters 2018-02-17 08:51:09 +01:00
parent 1f09544f32
commit 280431f98d
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker-compose.yml
View File

@ -165,11 +165,7 @@ services:
- sogo - sogo
dovecot-mailcow: dovecot-mailcow:
<<<<<<< HEAD
image: mailcow/dovecot:1.21
=======
image: mailcow/dovecot:1.22 image: mailcow/dovecot:1.22
>>>>>>> master
build: ./data/Dockerfiles/dovecot build: ./data/Dockerfiles/dovecot
cap_add: cap_add:
- NET_BIND_SERVICE - NET_BIND_SERVICE