l10n daemon script 0c8cd94fe8 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"		2021-12-15 01:56:58 +00:00
..
activities	Port away from PlasmaComponents 2.0 on most places	2021-10-22 16:34:03 +00:00
krunner	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-12-15 01:56:58 +00:00
CMakeLists.txt	disable own clock for now	2020-07-23 15:27:24 +02:00