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/ssltunnel/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/ssltunnel') diff --git a/package/ssltunnel/Makefile b/package/ssltunnel/Makefile index e3d66b563..c7ad1b49d 100644 --- a/package/ssltunnel/Makefile +++ b/package/ssltunnel/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= ssltunnel PKG_VERSION:= 1.16 PKG_RELEASE:= 1 PKG_MD5SUM:= 4039b50566a33a4077883ea974e476d5 -PKG_DESCR:= PPP over SSL vpn tool +PKG_DESCR:= ppp over ssl vpn tool PKG_SECTION:= net/security PKG_DEPENDS:= libopenssl ppp PKG_BUILDDEP:= openssl ppp -- cgit v1.2.3