l10n daemon script a989a77a0d 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"		2015-06-03 10:14:00 +00: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	2015-06-03 10:14:00 +00:00