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/socat/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/socat') diff --git a/package/socat/Makefile b/package/socat/Makefile index 96a9592f4..51e3b35dd 100644 --- a/package/socat/Makefile +++ b/package/socat/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= socat PKG_VERSION:= 1.7.2.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 2a15dc3362f49d543abdbacc267d0a41 -PKG_DESCR:= A multipurpose relay (SOcket CAT) +PKG_DESCR:= multipurpose relay PKG_SECTION:= net/misc PKG_DEPENDS:= libpthread PKG_URL:= http://www.dest-unreach.org/socat/ -- cgit v1.2.3