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

[l10n daemon script]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 6c45467f2a9276a9d4f33cfc717512d27ca579c7
      https://github.com/Kst-plot/kst/commit/6c45467f2a9276a9d4f33cfc717512d27ca579c7
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-08-19 (Wed, 19 Aug 2015)

  Changed paths:
    M old_datasources/plankIDEF/kstdata_planckIDEF.desktop
    M src/datasources/bis/kstdata_bissource.desktop
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/datasources/sampledatasource/kstdata_sampledatasource.desktop
    M src/datasources/sourcelist/kstdata_sourcelist.desktop
    M src/plugins/dataobject/activitylevel/kstplugin_activitylevel.desktop
    M src/plugins/dataobject/bin/kstplugin_bin.desktop
    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/phase/kstplugin_phase.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"