l10n daemon script ac251b9878 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"		2026-10-05 01:51:33 +00:00
..
kcm	SVN_SILENT made messages (.desktop file) - always resolve ours	2026-10-05 01:51:33 +00:00
kded	SVN_SILENT made messages (.desktop file) - always resolve ours	2026-10-05 01:51:33 +00:00
lib	GIT_SILENT: use QStringLiteral. Avoiding runtime conversions including memallocs	2023-11-10 10:55:46 +01:00
CMakeLists.txt	[solid-device-automounter] Port to KF5	2015-08-20 21:43:30 +02:00
SETTINGS	Fix various typos	2021-12-01 10:22:09 -05:00