From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict
---
package/pptp/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
(limited to 'package/pptp')
diff --git a/package/pptp/Makefile b/package/pptp/Makefile
index 7cc36912b..b4a3f3d8e 100644
--- a/package/pptp/Makefile
+++ b/package/pptp/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:= pptp
PKG_VERSION:= 1.8.0
PKG_RELEASE:= 1
PKG_MD5SUM:= 4efce9f263e2c3f38d79d9df222476de
-PKG_DESCR:= Point-to-Point Tunneling Protocol (PPTP) client
-PKG_SECTION:= ppp
+PKG_DESCR:= point-to-point tunneling protocol client
+PKG_SECTION:= net/ppp
PKG_DEPENDS:= ppp
PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/}
--
cgit v1.2.3