l10n daemon script f7e83b4bcf SVN_SILENT made messages (.desktop file) - always resolve ours ... In case of conflict in i18n, keep the version of the branch "ours" To resolve a particular conflict, "git checkout --ours path/to/file.desktop"		2017-04-01 04:05:09 +02:00
..
contents/ui	don'rthave commented out imports in examples	2014-03-18 13:47:17 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-01 04:05:09 +02:00