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

2015-03-19 09:50:52 +00:00

..

contents/ui

port to new api

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

metadata.desktop

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

2015-03-19 09:50:52 +00:00