From: Joachim Wiedorn <ad_debian@joonet.de>
Date: Tue, 18 Jan 2011 23:42:32 +0000 (+0100)
Subject: Remove grub conflict (see 22.8-10)
X-Git-Tag: debian/23.1-1~5
X-Git-Url: https://git.rrq.au/?a=commitdiff_plain;h=fb3003bb0cc5af02e053cb6a3a1d42547ba69506;p=rrq%2Fmaintain_lilo.git

Remove grub conflict (see 22.8-10)
---

diff --git a/debian/control b/debian/control
index e93fd8a..ef768e7 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,6 @@ Homepage: http://lilo.alioth.debian.org/
 Package: lilo
 Architecture: amd64 i386
 Depends: mbr, ${shlibs:Depends}, ${misc:Depends}
-Conflicts: grub-pc, grub-legacy
 Suggests: lilo-doc
 Description: LInux LOader - the classic OS boot loader
  You can use LILO to manage your Master Boot Record (with a simple text