l10n daemon script c735bf3bcf 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"		2020-09-20 05:52:17 +02:00
..
contents	bigger hit area for the up arrow	2020-08-20 17:15:56 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-20 05:52:17 +02:00