l10n daemon script b015228ecd 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"

2021-03-31 02:16:10 +00:00

..

contextmenu

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

2021-03-31 02:16:10 +00:00

CMakeLists.txt

add containmentactions

2018-02-03 20:56:30 +02:00