amorfo77/mailcow-dockerized
1
0 Fork 0
mirror of https://github.com/mailcow/mailcow-dockerized.git synced 2026-10-22 02:38:12 +00:00
Code Issues Projects Releases Wiki Activity

Fix conflict

Browse Source
This commit is contained in:
André Peters committed 2018-02-17 08:51:09 +01:00
1 parent 1f09544f32
commit 280431f98d
1 file changed
-4
Download Patch File Download Diff File Expand all files Collapse all files
docker-compose.yml
-4
View File
@@ -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