[docs] Removed left over from merge conflict

Ref 5c40d84e78
2017-03-07 15:35:17 +01:00 · 2017-03-07 15:35:17 +01:00 · 040e1edb6a
parent 5c40d84e78
commit 040e1edb6a
1 changed files with 1 additions and 2 deletions
--- 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.