l10n daemon script c1acf75d7b 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-10-24 05:15:41 +02:00
..
contents/ui	stepsize 1 for screen brightness	2017-09-12 20:27:08 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-10-24 05:15:41 +02:00