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/strongswan/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/strongswan') diff --git a/package/strongswan/Makefile b/package/strongswan/Makefile index 996bddd06..9355f6b97 100644 --- a/package/strongswan/Makefile +++ b/package/strongswan/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= strongswan PKG_VERSION:= 5.1.1 PKG_RELEASE:= 1 PKG_MD5SUM:= f624ab041c306af0f5f57c927e9ea2e4 -PKG_DESCR:= IPsec software +PKG_DESCR:= ipsec software PKG_SECTION:= net/security PKG_DEPENDS:= ip libpthread PKG_URL:= http://strongswan.org/index.htm -- cgit v1.2.3