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/atftp/Makefile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'package/atftp')

diff --git a/package/atftp/Makefile b/package/atftp/Makefile
index 0d4f1407f..866878158 100644
--- a/package/atftp/Makefile
+++ b/package/atftp/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		atftp
 PKG_VERSION:=		0.7
 PKG_RELEASE:=		2
 PKG_MD5SUM:=		3b27365772d918050b2251d98a9c7c82
-PKG_DESCR:=		TFTP client
-PKG_SECTION:=		dhcp
+PKG_DESCR:=		tftp client
+PKG_SECTION:=		net/misc
 PKG_DEPENDS:=		libreadline libncurses
 PKG_BUILDDEP:=		readline ncurses
 PKG_URL:=		http://freshmeat.net/projects/atftp/
@@ -19,7 +19,7 @@ DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
 PKG_LIBC_DEPENDS:=	uclibc glibc
 
 PKG_SUBPKGS:=		ATFTP ATFTPD
-PKGSD_ATFTPD:=		TFTP server
+PKGSD_ATFTPD:=		tftp server
 PKGSS_ATFTPD:=		libreadline libncurses
 
 include $(TOPDIR)/mk/package.mk
-- 
cgit v1.2.3