Merge conflict

exegetes.eu.org.lektorproject

@@ -1,13 +1,6 @@
 [project]
 name = exegetes.eu.org
-<<<<<<< HEAD
 
-[servers.chimay]
-name = Chimay
-enabled = yes
-default = yes
-target = cp:///var/www/chimay
-=======
 url_style = relative
 
 [alternatives.fr]
@@ -19,4 +12,9 @@ locale = fr
 name = English
 url_prefix = /en/
 locale = en_US
->>>>>>> 8ba0e38c3a535e4dc3678e69c19ee40c776434aa
+
+[servers.chimay]
+name = Chimay
+enabled = yes
+default = yes
+target = cp:///var/www/chimay