From: Michael Prokop <mika@grml.org>
Date: Fri, 5 May 2017 14:07:54 +0000 (+0200)
Subject: Drop Conflicts on grml-etc <= 1.3.4, no longer relevant
X-Git-Tag: v0.5.0~8
X-Git-Url: http://git.grml.org/?p=grml-desktop.git;a=commitdiff_plain;h=86b59c3f840e73a75572f62869b4abf7f742f4a5

Drop Conflicts on grml-etc <= 1.3.4, no longer relevant
---

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