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

Mon Jun 22 05:00:12 UTC 2015

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