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/polipo/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/polipo') diff --git a/package/polipo/Makefile b/package/polipo/Makefile index 9422a4960..d4589a5ad 100644 --- a/package/polipo/Makefile +++ b/package/polipo/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= polipo PKG_VERSION:= 1.0.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= bfc5c85289519658280e093a270d6703 -PKG_DESCR:= HTTP 1.1 proxy with Socks5 support -PKG_SECTION:= proxy +PKG_DESCR:= web proxy with socks5 support +PKG_SECTION:= net/proxy PKG_URL:= http://www.pps.univ-paris-diderot.fr/~jch/software/polipo/ PKG_SITES:= http://freehaven.net/~chrisd/polipo/ -- cgit v1.2.3