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/frickin/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/frickin') diff --git a/package/frickin/Makefile b/package/frickin/Makefile index 67545b582..4c00e1dda 100644 --- a/package/frickin/Makefile +++ b/package/frickin/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= frickin PKG_VERSION:= 1.3 PKG_RELEASE:= 9 PKG_MD5SUM:= 5b2e98da2310c71c703d4617b88a173f -PKG_DESCR:= PPTP proxy -PKG_SECTION:= proxy +PKG_DESCR:= pptp proxy +PKG_SECTION:= net/proxy PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=frickin/} PKG_NOPARALLEL:= 1 -- cgit v1.2.3