l10n daemon script ca0148bc2b 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"		2023-06-24 03:44:55 +00:00
..
org.kde.falkon.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2023-06-24 03:44:55 +00:00