From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/pptp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pptp/Makefile') diff --git a/package/pptp/Makefile b/package/pptp/Makefile index ab0e63562..7cc36912b 100644 --- a/package/pptp/Makefile +++ b/package/pptp/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 4efce9f263e2c3f38d79d9df222476de PKG_DESCR:= Point-to-Point Tunneling Protocol (PPTP) client PKG_SECTION:= ppp -PKG_DEPENDS:= ppp kmod-net-ipgre +PKG_DEPENDS:= ppp PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=pptpclient/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -- cgit v1.2.3