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

[netterfield]

  Branch: refs/heads/master
  Home:   https://github.com/Kst-plot/kst
  Commit: c250288dcae3b476d55321b935fbaab5dec6b28b
      https://github.com/Kst-plot/kst/commit/c250288dcae3b476d55321b935fbaab5dec6b28b
  Author: l10n daemon script <scripty at kde.org>
  Date:   2025-08-30 (Sat, 30 Aug 2025)

  Changed paths:
    M src/plugins/filters/boxcar/kstplugin_boxcar.desktop
    M src/plugins/filters/exponential/kstplugin_exponential.desktop
    M src/plugins/filters/hpboxcar/kstplugin_hpboxcar.desktop
    M src/plugins/filters/movingaverage/kstplugin_movingaverage.desktop
    M src/plugins/filters/movingmedian/kstplugin_movingmedian.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"


  Commit: 2432c735b80b1440aa6c24f3d61f787a68b03bfd
      https://github.com/Kst-plot/kst/commit/2432c735b80b1440aa6c24f3d61f787a68b03bfd
  Author: l10n daemon script <scripty at kde.org>
  Date:   2025-08-31 (Sun, 31 Aug 2025)

  Changed paths:
    M src/kst/org.kde.kst.metainfo.xml

  Log Message:
  -----------
  GIT_SILENT made messages (after extraction)


Compare: https://github.com/Kst-plot/kst/compare/c890c79a1d43...2432c735b80b

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