l10n daemon script e80ebab9db 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-02-25 05:27:39 +01:00
..
contents/ui	Use QtQuickControls button, instead of PlasmaComponent's	2017-02-11 15:37:42 +01:00
metadata.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-02-25 05:27:39 +01:00