paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[docs] Removed left over from merge conflict 

Ref 5c40d84e78
master
Michael Käufl 2017-03-07 15:35:17 +01:00
parent 5c40d84e78
commit 040e1edb6a
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/u_and_e.md
View File

@ -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. 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. Beware that a mailbox user can login to mailcow and override a domain policy filter item.
<<<<<<< HEAD
## Change default language ## Change default language
Change `data/conf/sogo/sogo.conf` and replace "English" by your prefered language. Change `data/conf/sogo/sogo.conf` and replace "English" by your prefered language.