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/l2tpns/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/l2tpns') diff --git a/package/l2tpns/Makefile b/package/l2tpns/Makefile index c3e9f07cc..9586937ba 100644 --- a/package/l2tpns/Makefile +++ b/package/l2tpns/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= l2tpns PKG_VERSION:= 2.1.21 PKG_RELEASE:= 3 PKG_MD5SUM:= 385c58055723ebc6c38062acd2db9c2c -PKG_DESCR:= layer 2 tunneling protocol network server (LNS) +PKG_DESCR:= layer 2 tunneling protocol network server PKG_SECTION:= net/security PKG_DEPENDS:= libcli PKG_BUILDDEP:= libcli -- cgit v1.2.3