Home Explore Help
Sign In
mirrors
/
mailcow-dockerized
mirror of https://github.com/mailcow/mailcow-dockerized
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

Fix conflict

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

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