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/tinyproxy/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/tinyproxy') diff --git a/package/tinyproxy/Makefile b/package/tinyproxy/Makefile index 612d60cbf..33a61509d 100644 --- a/package/tinyproxy/Makefile +++ b/package/tinyproxy/Makefile @@ -7,9 +7,9 @@ PKG_NAME:= tinyproxy PKG_VERSION:= 1.8.3 PKG_RELEASE:= 2 PKG_MD5SUM:= eca927f7f6a9ce8394b2b256361978a7 -PKG_DESCR:= lightweight HTTP and HTTPS proxy +PKG_DESCR:= lightweight http and https proxy PKG_BUILDDEP:= autotool -PKG_SECTION:= proxy +PKG_SECTION:= net/proxy PKG_URL:= https://www.banu.com/tinyproxy/ PKG_SITES:= https://www.banu.com/pub/tinyproxy/1.8/ -- cgit v1.2.3