Merge pull request #3892 from robberer/bugfix/grub

grub: fix grub merge error

Changed files
-5
nixos
modules
system
boot
loader
-5
nixos/modules/system/boot/loader/grub/install-grub.pl
···
$conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n";
} else {
$conf .= "menuentry \"$name\" {\n";
-
<<<<<<< HEAD
-
$conf .= $grubBoot->search . "\n";
-
$conf .= $grubStore->search . "\n";
-
=======
-
>>>>>>> parent of 469f22d... Merge pull request #2449 from wkennington/master.grub
$conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig;
$conf .= " multiboot $xen $xenParams\n" if $xen;
$conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n";