Create merge conflict on zanata.xml

This commit is contained in:
Luc Didry
2018-04-07 12:07:43 +02:00
parent 8ab966f83c
commit 09f1492486
+1 -3
View File
@@ -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>