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

[netterfield]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: 01fb5b6f71f6baf989381ac494b3aab522a05610
      https://github.com/Kst-plot/kst/commit/01fb5b6f71f6baf989381ac494b3aab522a05610
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-10-17 (Thu, 17 Oct 2024)

  Changed paths:
    M src/datasources/matlab/kstdata_matlab.desktop
    M src/plugins/dataobject/lockin/kstplugin_lockin.desktop
    M src/plugins/filters/boxcar/kstplugin_boxcar.desktop
    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/despike/kstplugin_filter_despike.desktop
    M src/plugins/filters/flag/kstplugin_filter_flag.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"



To unsubscribe from these emails, change your notification settings at https://github.com/Kst-plot/kst/settings/notifications