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/srelay/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/srelay/Makefile') diff --git a/package/srelay/Makefile b/package/srelay/Makefile index d0bf0ebe3..1ce4e3988 100644 --- a/package/srelay/Makefile +++ b/package/srelay/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 0.4.7p3 PKG_RELEASE:= 1 PKG_MD5SUM:= 214ca8bc476c5e0eab54adb01972be6a PKG_DESCR:= socks 4/5 proxy server -PKG_SECTION:= proxy +PKG_SECTION:= net/proxy PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=socks-relay/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -- cgit v1.2.3