l10n daemon script 7f1e574816 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"		2024-01-29 01:12:33 +00:00
..
CMakeLists.txt	Adapt to KNotificationJobUiDelegate moving to KJobWidgets	2023-08-21 22:00:23 +00:00
kded_plasma_mobile_start.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2024-01-29 01:12:33 +00:00
start.cpp	kded: Fix package not being loaded	2023-04-06 19:35:56 -07:00
start.h	kded: Fix class name	2023-03-31 23:55:23 -07:00