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

[netterfield]

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

  Changed paths:
    M src/plugins/filters/boxcar/kstplugin_boxcar.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: 07d15fac34c718b9433bd9480b78079031032e4e
      https://github.com/Kst-plot/kst/commit/07d15fac34c718b9433bd9480b78079031032e4e
  Author: l10n daemon script <scripty at kde.org>
  Date:   2024-10-20 (Sun, 20 Oct 2024)

  Changed paths:
    M src/plugins/filters/boxcar/kstplugin_boxcar.desktop
    M src/plugins/filters/exponential/kstplugin_exponential.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"


Compare: https://github.com/Kst-plot/kst/compare/27e85177ff1e...07d15fac34c7

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