From f27cf293dd57669a1421aa6fa67266e3aaa927be Mon Sep 17 00:00:00 2001
From: Luc Didry <luc@didry.org>
Date: Sun, 11 Mar 2018 10:26:54 +0100
Subject: [PATCH] Create a conflict on zanata.xml between master and dev
 branches

---
 zanata.xml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/zanata.xml b/zanata.xml
index 60d0f5d..49c94c5 100644
--- a/zanata.xml
+++ b/zanata.xml
@@ -2,7 +2,9 @@
 <config xmlns="http://zanata.org/namespace/config/">
   <url>https://trad.framasoft.org/zanata/</url>
   <project>lutim</project>
+
   <project-version>master</project-version>
+
   <project-type>gettext</project-type>
   <src-dir>themes/default/lib/Lutim/I18N/</src-dir>
   <trans-dir>themes/default/lib/Lutim/I18N/</trans-dir>