Create a conflict on zanata.xml between master and dev branches

This commit is contained in:
Luc Didry
2018-03-11 10:26:54 +01:00
parent 0295ba3666
commit f27cf293dd
+2
View File
@@ -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>