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

(limited to 'package/wccpd')

diff --git a/package/wccpd/Makefile b/package/wccpd/Makefile
index e084b7140..c835a37a2 100644
--- a/package/wccpd/Makefile
+++ b/package/wccpd/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		wccpd
 PKG_VERSION:=		0.2
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		5f15c274de61dfb88e0dbfc1ccbe6b67
-PKG_DESCR:=		WCCP (Web Cache Coordination Protocol) server daemon
-PKG_SECTION:=		net/misc
+PKG_DESCR:=		web cache coordination protocol server daemon
+PKG_SECTION:=		net/proxy
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=wccpd/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-- 
cgit v1.2.3