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

[l10n daemon script]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 49e1fbc2be42b229ce1c83cf5031424bd2ceafd7
      https://github.com/Kst-plot/kst/commit/49e1fbc2be42b229ce1c83cf5031424bd2ceafd7
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-12-20 (Sun, 20 Dec 2015)

  Changed paths:
    M src/plugins/dataobject/chop/kstplugin_chop.desktop
    M src/plugins/dataobject/convolution/convolve/kstplugin_convolve.desktop
    M src/plugins/dataobject/convolution/deconvolve/kstplugin_deconvolve.desktop
    M src/plugins/dataobject/correlation/autocorrelation/kstplugin_autocorrelation.desktop
    M src/plugins/dataobject/correlation/crosscorrelation/kstplugin_crosscorrelation.desktop
    M src/plugins/dataobject/crossspectrum/kstplugin_crossspectrum.desktop
    M src/plugins/dataobject/effectivebandwidth/kstplugin_effectivebandwidth.desktop
    M src/plugins/dataobject/genericfilter/kstplugin_genericfilter.desktop
    M src/plugins/dataobject/interpolations/akima/kstplugin_akima.desktop
    M src/plugins/dataobject/interpolations/akimaperiodic/kstplugin_akimaperiodic.desktop
    M src/plugins/dataobject/interpolations/cspline/kstplugin_akima.desktop
    M src/plugins/dataobject/interpolations/csplineperiodic/kstplugin_csplineperiodic.desktop
    M src/plugins/dataobject/interpolations/linear/kstplugin_linear.desktop
    M src/plugins/dataobject/interpolations/polynomial/kstplugin_polynomial.desktop
    M src/plugins/dataobject/linefit/kstplugin_linefit.desktop
    M src/plugins/dataobject/lockin/kstplugin_lockin.desktop
    M src/plugins/dataobject/noiseaddition/kstplugin_noiseaddition.desktop
    M src/plugins/dataobject/periodogram/kstplugin_periodogram.desktop
    M src/plugins/dataobject/phase/kstplugin_phase.desktop
    M src/plugins/dataobject/shift/kstplugin_shift.desktop
    M src/plugins/dataobject/statistics/kstplugin_statistics.desktop
    M src/plugins/dataobject/syncbin/kstplugin_syncbin.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"