projects / rrq / maintain_lilo.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c9a88b4)
Remove grub conflict (see 22.8-10)
authorJoachim Wiedorn <ad_debian@joonet.de>
Tue, 18 Jan 2011 23:42:32 +0000 (00:42 +0100)
committerJoachim Wiedorn <ad_debian@joonet.de>
Tue, 18 Jan 2011 23:42:32 +0000 (00:42 +0100)
debian/control patch | blob | history

diff --git a/debian/control b/debian/control
index e93fd8ac2eba5040be6bcebdc46bfe694b0cab83..ef768e7e63c3e802d1f27bca6bc8f364074aa24e 100644 (file)
--- 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