l10n daemon script f18deb69f1 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"		2020-06-09 09:19:42 +02:00
..
contents/ui	[kcm/kwinrules] Fix first item position on property list	2020-05-31 10:54:28 +00:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-09 09:19:42 +02:00