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

Sat Apr 23 04:00:11 UTC 2016

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 93f6dade4e8e0906d091d558815f8bfa007b70f8
      https://github.com/Kst-plot/kst/commit/93f6dade4e8e0906d091d558815f8bfa007b70f8
  Author: l10n daemon script <scripty at kde.org>
  Date:   2016-04-23 (Sat, 23 Apr 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"