l10n daemon script 0c8cd94fe8 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"		2021-12-15 01:56:58 +00:00
..
contents	homescreen: Change default favourites apps	2021-12-12 12:05:19 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:56:58 +00:00