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

[l10n daemon script]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 6cedc7e99cb7e1185ab58e617f08e69fb67f900b
      https://github.com/Kst-plot/kst/commit/6cedc7e99cb7e1185ab58e617f08e69fb67f900b
  Author: l10n daemon script <scripty at kde.org>
  Date:   2015-11-14 (Sat, 14 Nov 2015)

  Changed paths:
    M src/datasources/tiff16source/kstdata_tiff16source.desktop
    M src/plugins/filters/differentiation/kstplugin_differentiation.desktop
    M src/plugins/filters/unwind/kstplugin_filter_unwind.desktop
    M src/plugins/filters/window/kstplugin_filter_window.desktop
    M src/plugins/fits/exponential_unweighted/kstplugin_fits_exponential_unweighted.desktop
    M src/plugins/fits/exponential_weighted/kstplugin_fits_exponential_weighted.desktop
    M src/plugins/fits/gaussian_unweighted/kstplugin_fits_gaussian_unweighted.desktop
    M src/plugins/fits/gaussian_weighted/kstplugin_fits_gaussian_weighted.desktop
    M src/plugins/fits/gradient_unweighted/kstplugin_fits_gradient_unweighted.desktop
    M src/plugins/fits/gradient_weighted/kstplugin_fits_gradient_weighted.desktop
    M src/plugins/fits/kneefrequency/kstplugin_fits_kneefrequency.desktop
    M src/plugins/fits/linear_unweighted/kstplugin_fits_linear_unweighted.desktop
    M src/plugins/fits/linear_weighted/kstplugin_fits_linear_weighted.desktop
    M src/plugins/fits/lorentzian_unweighted/kstplugin_fits_lorentzian_unweighted.desktop
    M src/plugins/fits/lorentzian_weighted/kstplugin_fits_lorentzian_weighted.desktop
    M src/plugins/fits/polynomial_unweighted/kstplugin_fits_polynomial_unweighted.desktop
    M src/plugins/fits/polynomial_weighted/kstplugin_fits_polynomial_weighted.desktop
    M src/plugins/fits/sinusoid_unweighted/kstplugin_fits_sinusoid_unweighted.desktop
    M src/plugins/fits/sinusoid_weighted/kstplugin_fits_sinusoid_weighted.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"