l10n daemon script 24564244ed 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-10-06 01:21:57 +00:00

..

CMakeLists.txt

Enable KCrash for all executables

2024-08-01 11:23:02 +00:00

main.cpp

Enable KCrash for all executables

2024-08-01 11:23:02 +00:00

Messages.sh

Move settings app into own folder and make it a KDBusService

2020-01-17 01:32:56 +01:00

org.kde.kdeconnect-settings.desktop

SVN_SILENT made messages (.desktop file) - always resolve ours

2024-10-06 01:21:57 +00:00