[Kst] [Kst-plot/kst] 06f184: SVN_SILENT made messages (.desktop file) - always ...

[l10n daemon script]

Branch: refs/heads/master
Home: https://github.com/Kst-plot/kst
Commit: 06f184e658f23ae8474748639662912b5b2f563a
https://github.com/Kst-plot/kst/commit/06f184e658f23ae8474748639662912b5b2f563a
Author: l10n daemon script <***@kde.org>
Date: 2016-05-15 (Sun, 15 May 2016)

Changed paths:
M src/plugins/filters/flag/kstplugin_filter_flag.desktop

Log Message:
-----------
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"