From e28550b896213371a55c59460607cccf0b3b6b26 Mon Sep 17 00:00:00 2001
From: Laurent Declercq <l.declercq@nuxwin.com>
Date: Thu, 22 Sep 2016 21:27:26 +0200
Subject: [PATCH] Reverting unwanted change [ci skip]

---
 CHANGELOG                        | 3 ---
 docs/Debian/packages-jessie.xml  | 5 +----
 docs/Debian/packages-stretch.xml | 5 +----
 docs/Debian/packages-wheezy.xml  | 5 +----
 docs/Ubuntu/packages-precise.xml | 4 +---
 docs/Ubuntu/packages-trusty.xml  | 4 +---
 docs/Ubuntu/packages-xenial.xml  | 4 +---
 7 files changed, 6 insertions(+), 24 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index 0da0e6e9b5..4c86966e7a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -15,9 +15,6 @@ CONFIGS
     Updated: Request headers in redirect vhosts (Apache2)
     Removed:  /etc/imscp/imscp.old.conf configuration file
 
-DISTRIBUTIONS
-    Added: Conflict on the `avahi-daemon' package
-
 CRONJOBS
     Fixed: run() subroutine is run twice per process (imscp-disable-accounts)
 
diff --git a/docs/Debian/packages-jessie.xml b/docs/Debian/packages-jessie.xml
index 8d2c20d795..103951a6e2 100644
--- a/docs/Debian/packages-jessie.xml
+++ b/docs/Debian/packages-jessie.xml
@@ -83,11 +83,8 @@
         <bind>
             <package>resolvconf</package>
             <package>bind9</package>
-            <package_conflict>avahi-daemon</package_conflict>
         </bind>
-        <external_server>
-            <package_conflict>avahi-daemon</package_conflict>
-        </external_server>
+        <external_server/>
     </named>
     <sql default="mysql_5.5">
         <mysql_5.5
diff --git a/docs/Debian/packages-stretch.xml b/docs/Debian/packages-stretch.xml
index 1ad0cd3489..8f88203888 100644
--- a/docs/Debian/packages-stretch.xml
+++ b/docs/Debian/packages-stretch.xml
@@ -75,11 +75,8 @@
         <bind>
             <package>resolvconf</package>
             <package>bind9</package>
-            <package_conflict>avahi-daemon</package_conflict>
         </bind>
-        <external_server>
-            <package_conflict>avahi-daemon</package_conflict>
-        </external_server>
+        <external_server/>
     </named>
     <sql default="mysql_5.6">
         <mysql_5.6
diff --git a/docs/Debian/packages-wheezy.xml b/docs/Debian/packages-wheezy.xml
index 9abee605b4..cd0d4692c9 100644
--- a/docs/Debian/packages-wheezy.xml
+++ b/docs/Debian/packages-wheezy.xml
@@ -103,11 +103,8 @@
         <bind>
             <package>resolvconf</package>
             <package>bind9</package>
-            <package_conflict>avahi-daemon</package_conflict>
         </bind>
-        <external_server>
-            <package_conflict>avahi-daemon</package_conflict>
-        </external_server>
+        <external_server/>
     </named>
     <sql default="mysql_5.5">
         <mysql_5.5
diff --git a/docs/Ubuntu/packages-precise.xml b/docs/Ubuntu/packages-precise.xml
index 02bf828aa5..1cce81d768 100644
--- a/docs/Ubuntu/packages-precise.xml
+++ b/docs/Ubuntu/packages-precise.xml
@@ -86,9 +86,7 @@
             <package>resolvconf</package>
             <package>bind9</package>
         </bind>
-        <external_server>
-            <package_conflict>avahi-daemon</package_conflict>
-        </external_server>
+        <external_server/>
     </named>
     <sql default="mysql_5.5">
         <mysql_5.5
diff --git a/docs/Ubuntu/packages-trusty.xml b/docs/Ubuntu/packages-trusty.xml
index 4913e423d3..14b796f62f 100644
--- a/docs/Ubuntu/packages-trusty.xml
+++ b/docs/Ubuntu/packages-trusty.xml
@@ -86,9 +86,7 @@
             <package>resolvconf</package>
             <package>bind9</package>
         </bind>
-        <external_server>
-            <package_conflict>avahi-daemon</package_conflict>
-        </external_server>
+        <external_server/>
     </named>
     <sql default="mysql_5.5">
         <mysql_5.5
diff --git a/docs/Ubuntu/packages-xenial.xml b/docs/Ubuntu/packages-xenial.xml
index 34dcd7929b..b7feb28314 100644
--- a/docs/Ubuntu/packages-xenial.xml
+++ b/docs/Ubuntu/packages-xenial.xml
@@ -88,9 +88,7 @@
             <package>resolvconf</package>
             <package>bind9</package>
         </bind>
-        <external_server>
-            <package_conflict>avahi-daemon</package_conflict>
-        </external_server>
+        <external_server/>
     </named>
     <sql default="mysql_5.7">
         <mysql_5.7