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

Sun Jun 7 05:00:08 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 87b871fc2bd7f0090fcee23888b629f03c4d1b13
      https://github.com/Kst-plot/kst/commit/87b871fc2bd7f0090fcee23888b629f03c4d1b13
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-06-07 (Sun, 07 Jun 2015)

  Changed paths:
    M src/plugins/filters/window/kstplugin_filter_window.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"