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

(limited to 'package/wput')

diff --git a/package/wput/Makefile b/package/wput/Makefile
index 183c339ae..408c6a4d4 100644
--- a/package/wput/Makefile
+++ b/package/wput/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		wput
 PKG_VERSION:=		0.6.1
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		92b41efed4db8eb4f3443c23bf7ceecf
-PKG_DESCR:=		a wget-like command-line FTP client
-PKG_SECTION:=		www
+PKG_DESCR:=		wget-like command-line ftp client
+PKG_SECTION:=		net/http
 PKG_SITES:=		${MASTER_SITE_SOURCEFORGE:=wput/}
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tgz
-- 
cgit v1.2.3