shift-shell/kded/start
l10n daemon script f7851a3f8f 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-04-25 01:16:26 +00:00
..
CMakeLists.txt kded/autodetectapn: Add background service to automatically add APN connections 2024-02-23 15:35:31 +00:00
kded_plasma_mobile_start.json SVN_SILENT made messages (.desktop file) - always resolve ours 2024-04-25 01:16:26 +00:00
start.cpp kded/autodetectapn: Add background service to automatically add APN connections 2024-02-23 15:35:31 +00:00
start.h kded/autodetectapn: Add background service to automatically add APN connections 2024-02-23 15:35:31 +00:00