l10n daemon script f40b707e58 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"		2022-05-03 01:48:40 +00:00
..
org.kde.falkon.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2022-05-03 01:48:40 +00:00