l10n daemon script b1ede93cdb 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-05-22 01:19:14 +00:00

..

CMakeLists.txt

Add purpose plugin

2024-03-11 20:07:00 +01:00

purposeplugin.cpp

Add purpose plugin

2024-03-11 20:07:00 +01:00

purposeplugin.json

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

2024-05-22 01:19:14 +00:00