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

2016-01-22 09:52:02 +00:00

..

contents

port to new api

2014-02-04 17:29:28 +01:00

metadata.desktop

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

2016-01-22 09:52:02 +00:00