l10n daemon script 0196b6f29a 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-03-30 06:07:26 +01:00
..
contents/ui	[kcmkwin/kwindecoration] Use new API to set cell size properly	2019-03-14 09:34:48 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-03-30 06:07:26 +01:00