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/mt-daapd/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/mt-daapd')

diff --git a/package/mt-daapd/Makefile b/package/mt-daapd/Makefile
index 85ceeface..73272d062 100644
--- a/package/mt-daapd/Makefile
+++ b/package/mt-daapd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		mt-daapd
 PKG_VERSION:=		0.2.4.2
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		67bef9fb14d487693b0dfb792c3f1b05
-PKG_DESCR:=		a multi-threaded DAAP daemon
-PKG_SECTION:=		multimedia
+PKG_DESCR:=		multi-threaded daap daemon
+PKG_SECTION:=		mm/audio
 PKG_DEPENDS:=		libgdbm libid3tag libpthread
 PKG_BUILDDEP:=		gdbm libid3tag
 PKG_URL:=		http://www.fireflymediaserver.org/
-- 
cgit v1.2.3