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/pptpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/pptpd') diff --git a/package/pptpd/Makefile b/package/pptpd/Makefile index ad91ee1e2..5934d24e6 100644 --- a/package/pptpd/Makefile +++ b/package/pptpd/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 2 PKG_MD5SUM:= b38df9c431041922c997c1148bedf591 PKG_DESCR:= Point-to-Point Tunneling Protocol (PPTP) server PKG_SECTION:= ppp -PKG_DEPENDS:= ppp kmod-crypto kmod-ppp-mppe kmod-ppp kmod-net-ipgre +PKG_DEPENDS:= ppp PKG_URL:= http://www.poptop.org/ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=poptop/} -- cgit v1.2.3