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

Wed Feb 17 04:00:10 UTC 2016

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 3230fa7709254407bdb30acbc860bceb82fea29f
      https://github.com/Kst-plot/kst/commit/3230fa7709254407bdb30acbc860bceb82fea29f
  Author: l10n daemon script <scripty at kde.org>
  Date:   2016-02-17 (Wed, 17 Feb 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"