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

Mon Feb 22 04:00:08 UTC 2016

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