From baf785d55965b1379a5277ce294e1592d1caed84 Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Thu, 14 Nov 2019 22:40:50 +0100
Subject: Adding conflicts against resolvconf in progress-linux-base.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 debian/control | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/debian/control b/debian/control
index f3101f3..f9e8758 100644
--- a/debian/control
+++ b/debian/control
@@ -55,6 +55,8 @@ Depends:
  sudo,
  vim,
  wget,
+Conflicts:
+ resolvconf,
 Enhances:
  progress-linux,
 Description: Progress Linux - Base System
-- 
cgit v1.2.3