X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fcontrol;h=74de52994f3c5bbae78cfb8cdad4df58c3e2e63a;hb=86b59c3f840e73a75572f62869b4abf7f742f4a5;hp=2094be82280ae4bb798db06d2665d715c2e4f391;hpb=3031693b24058c1a56a3ac63cf1771169413dd84;p=grml-desktop.git

diff --git a/debian/control b/debian/control
index 2094be8..74de529 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,6 @@ Architecture: all
 Depends: grml-scripts (>= 1.1.18), moblin-icon-theme, hsetroot, ${misc:Depends}
 Recommends: fluxbox
 Suggests: idesk, fvwm | fvwm2 | fvwm-crystal, awesome, pekwm
-Conflicts: grml-etc (<= 1.3.4)
 Description: configuration files for the X desktop at grml
  This package provides several configuration files for
  different tools and window managers used at Grml. The