From 196c6260be03f41748c0599892718d2ec5a39b95 Mon Sep 17 00:00:00 2001
From: Longrin Wischnewski <robberer@freakmail.de>
Date: Sun, 31 Aug 2014 12:29:13 +0200
Subject: [PATCH] grub: fix grub merge error

---
 nixos/modules/system/boot/loader/grub/install-grub.pl | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl
index 2fb771b5edf4..b4900358a5dc 100644
--- a/nixos/modules/system/boot/loader/grub/install-grub.pl
+++ b/nixos/modules/system/boot/loader/grub/install-grub.pl
@@ -178,11 +178,6 @@ sub addEntry {
         $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";