From 09f14924862186331a21480ebd131d42601cf2f5 Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sat, 7 Apr 2018 12:07:43 +0200
Subject: [PATCH] Create merge conflict on zanata.xml

---
 zanata.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/zanata.xml b/zanata.xml
index 49c94c5..2d6779e 100644
--- a/zanata.xml
+++ b/zanata.xml
@@ -1,10 +1,8 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <config xmlns="http://zanata.org/namespace/config/">
   <url>https://trad.framasoft.org/zanata/</url>
-  <project>lutim</project>
-
   <project-version>master</project-version>
-
+  <project>lutim</project>
   <project-type>gettext</project-type>
   <src-dir>themes/default/lib/Lutim/I18N/</src-dir>
   <trans-dir>themes/default/lib/Lutim/I18N/</trans-dir>