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

l10n daemon script scripty at kde.org
Sat Oct 10 04:00:09 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: a4f56d0142c1bd0fdd14ada95acb28e14eeb09b0
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-10-10 (Sat, 10 Oct 2015)

  Changed paths:
    M src/plugins/filters/despike/kstplugin_filter_despike.desktop
    M src/plugins/sampleplugin/kstplugin_sampleplugin.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"

More information about the Kst mailing list