l10n daemon script 6bb1653746 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-03-03 07:53:40 +01:00
..
activities	SVN_SILENT made messages (.desktop file) - always resolve ours	2021-03-03 07:53:40 +01:00
clock	Convert license headers to SPDX	2021-03-02 22:45:25 +01:00
krunner	Convert license headers to SPDX	2021-03-02 22:45:25 +01:00
CMakeLists.txt	disable own clock for now	2020-07-23 15:27:24 +02:00