diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-13 13:44:08 +0200 |
commit | 05d715df3ac052fb41a5ab42369d05a3e2a82de3 (patch) | |
tree | e99502f671b83f6898a77b78f88fdc67be8aa251 /package/pptpd | |
parent | e251f8299bf34e329613e68116d47e124192bc84 (diff) |
resolve merge conflict
Diffstat (limited to 'package/pptpd')
-rw-r--r-- | package/pptpd/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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/} |