From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/asterisk/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/asterisk/Makefile')

diff --git a/package/asterisk/Makefile b/package/asterisk/Makefile
index 12025b50b..39be1d951 100644
--- a/package/asterisk/Makefile
+++ b/package/asterisk/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		asterisk
 PKG_VERSION:=		1.8.20.1
 PKG_RELEASE:=		3
 PKG_MD5SUM:=		99204257de80a42c4e287fc93dfe714a
-PKG_DESCR:=		open source PBX
-PKG_SECTION:=		phone
+PKG_DESCR:=		open source pbx
+PKG_SECTION:=		net/voip
 PKG_DEPENDS:=		libncurses libpthread libopenssl libcurl libstdcxx
 PKG_BUILDDEP:=		ncurses openssl zlib curl popt gtk+
 PKG_URL:=		http://www.asterisk.org/
-- 
cgit v1.2.3