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/vpnc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/vpnc') diff --git a/package/vpnc/Makefile b/package/vpnc/Makefile index df3b4b07e..138e2dba5 100644 --- a/package/vpnc/Makefile +++ b/package/vpnc/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= vpnc PKG_VERSION:= 0.5.3 PKG_RELEASE:= 2 PKG_MD5SUM:= 4378f9551d5b077e1770bbe09995afb3 -PKG_DESCR:= client for cisco3000 VPN Concentrator +PKG_DESCR:= client for cisco3000 vpn concentrator PKG_SECTION:= net/security PKG_DEPENDS:= libgcrypt libgpg-error PKG_BUILDDEP:= libgcrypt libgpg-error -- cgit v1.2.3