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

Fri Feb 12 04:00:09 UTC 2016

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