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

2017-10-02 05:06:35 +02:00

..

contents

disable directRender when showing context menus

2017-09-16 00:33:19 +03:00

metadata.desktop

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

2017-10-02 05:06:35 +02:00