Merge branch 'debian-next' into master-next

[live-boot-grml.git] / debian / control

diff --git a/debian/control b/debian/control
index 28cc4d5..e5ef27a 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -33,8 +33,6 @@ Package: live-boot-grml-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Conflicts: live-boot (<< 3.0~a18~)
-Replaces: live-boot
 Description: Live System Boot Scripts (documentation)
  live-boot contains the scripts that configure a live system during the boot
  process (early userspace).