From 040e1edb6a854f963e2e23c5c07f097c82c6dc16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20K=C3=A4ufl?= <mailcow@c.michael-kaeufl.de>
Date: Tue, 7 Mar 2017 15:35:17 +0100
Subject: [PATCH] [docs] Removed left over from merge conflict

Ref 5c40d84e78d23e69c92957be5c267a2ffaeb724e
---
 docs/u_and_e.md | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/docs/u_and_e.md b/docs/u_and_e.md
index 2470cd14..fe4a3913 100644
--- a/docs/u_and_e.md
+++ b/docs/u_and_e.md
@@ -52,8 +52,7 @@ curl -L https://raw.githubusercontent.com/docker/compose/$(docker-compose versio
 Edit a domain as (domain) administrator to add an item to the filter table.
 
 Beware that a mailbox user can login to mailcow and override a domain policy filter item. 
-<<<<<<< HEAD
-
+
 ## Change default language
 
 Change `data/conf/sogo/sogo.conf` and replace "English" by your prefered language.