From: Jiri Slachta <slachta@cesnet.cz>
Date: Tue, 5 Apr 2016 08:42:02 +0000 (+0200)
Subject: asterisk-13.x: use conflicts only in asterisk11 makefile
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6dcc36464b0ee3ae01c602669774fca140cbf324;p=feed%2Ftelephony.git

asterisk-13.x: use conflicts only in asterisk11 makefile

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
---

diff --git a/net/asterisk-13.x/Makefile b/net/asterisk-13.x/Makefile
index 0ac479a..3b931cd 100644
--- a/net/asterisk-13.x/Makefile
+++ b/net/asterisk-13.x/Makefile
@@ -94,7 +94,6 @@ $(call Package/asterisk13/Default)
   TITLE:=Complete open source PBX, v$(PKG_VERSION)
   MENU:=1
   DEPENDS:=+jansson +libncurses +libopenssl +libpopt +libsqlite3 +libstdcpp +libuuid +libxml2 +libxslt +zlib
-  CONFLICTS:=asterisk11
 endef
 
 define Package/asterisk13/description