l10n daemon script b44134fd07 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"		2018-10-10 06:19:06 +02:00
..
org.kde.falkon.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-10 06:19:06 +02:00