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

[l10n daemon script]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 336fcf636e42edf8100e09531c5ddec4aabdc330
      https://github.com/Kst-plot/kst/commit/336fcf636e42edf8100e09531c5ddec4aabdc330
  Author: l10n daemon script <scripty at kde.org>
  Date:   2016-09-26 (Mon, 26 Sep 2016)

  Changed paths:
    M src/datasources/bis/kstdata_bissource.desktop
    M src/datasources/qimagesource/kstdata_qimagesource.desktop
    M src/datasources/tiff16source/kstdata_tiff16source.desktop
    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"