Reverting unwanted change

[ci skip]
i-MSCP · Sep 22, 2016 · e28550b · e28550b
1 parent 83bc1d3
commit e28550b
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 24 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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