[yast/yast-bootloader] 02efa5: fix overlooked conflicts

6 Oct 2022


      Branch: refs/heads/merge_pwd_leak_sp3
  Home:   https://github.com/yast/yast-bootloader
  Commit: 02efa5887873c196975d27ff8d22fa8f8de67f37
      https://github.com/yast/yast-bootloader/commit/02efa5887873c196975d27ff8d22f...
  Author: Josef Reidinger <jreidinger@suse.cz>
  Date:   2022-10-06 (Thu, 06 Oct 2022)

  Changed paths:
    M package/yast2-bootloader.changes
    M src/lib/bootloader/grub_install.rb

  Log Message:
  -----------
  fix overlooked conflicts