shift-shell/quicksettings/flashlight/kauth
l10n daemon script 0b7398de5d 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-04-09 01:47:48 +00:00
..
CMakeLists.txt Install logging categories 2026-04-06 13:39:00 +02:00
flashlighthelper.actions SVN_SILENT made messages (.desktop file) - always resolve ours 2026-04-09 01:47:48 +00:00
flashlighthelper.cpp quicksettings: Move Flashlight write to KAuth 2025-07-23 11:34:33 +02:00