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

[l10n daemon script]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: e53f0aac964bfe4e3d743439941ee1b14a9fc1a6
      https://github.com/Kst-plot/kst/commit/e53f0aac964bfe4e3d743439941ee1b14a9fc1a6
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-09-15 (Tue, 15 Sep 2015)

  Changed paths:
    M src/plugins/filters/butterworth_bandpass/kstplugin_filter_butterworth_bandpass.desktop
    M src/plugins/filters/butterworth_bandstop/kstplugin_filter_butterworth_bandstop.desktop
    M src/plugins/filters/butterworth_highpass/kstplugin_filter_butterworth_highpass.desktop
    M src/plugins/filters/butterworth_lowpass/kstplugin_filter_butterworth_lowpass.desktop
    M src/plugins/filters/cumulativeaverage/kstplugin_cumulativeaverage.desktop
    M src/plugins/filters/cumulativesum/kstplugin_cumulativesum.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"