From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Thu, 29 May 2014 11:40:49 +0200 Subject: resolve merge conflict --- package/netcat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/netcat') diff --git a/package/netcat/Makefile b/package/netcat/Makefile index 0ad7a5bbb..17a48d233 100644 --- a/package/netcat/Makefile +++ b/package/netcat/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= netcat PKG_VERSION:= 0.7.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 088def25efe04dcdd1f8369d8926ab34 -PKG_DESCR:= the GNU network swiss army knife +PKG_DESCR:= network swiss army knife PKG_SECTION:= net/misc PKG_URL:= http://netcat.sourceforge.net/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=netcat/} -- cgit v1.2.3