From 280431f98d2531cb086262ca5a39d3b2de69b987 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9=20Peters?= <andre.peters@debinux.de>
Date: Sat, 17 Feb 2018 08:51:09 +0100
Subject: [PATCH] Fix conflict

---
 docker-compose.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index e2612adc..1016cfde 100644
--- a/docker-compose.yml
+++ b/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