l10n daemon script 9a85283cd7 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-10-21 02:15:56 +00:00

..

package

[indicators api] - new background corner margin

2021-10-03 09:21:12 +03:00

metadata.desktop

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

2021-10-21 02:15:56 +00:00