l10n daemon script 93ab16b995 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"		2019-07-18 05:28:09 +02:00
..
contents/ui	[decorations] Let KDecoration plugins recommend a border size per default	2019-06-06 22:24:45 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-07-18 05:28:09 +02:00