l10n daemon script e3741c0570 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"		2016-12-20 13:25:24 +01:00
..
contents/ui	[kwinmultitasking] Add more exceptions to the Switcher	2015-06-10 18:04:14 +02:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:25:24 +01:00