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/tinc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/tinc/Makefile') diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 0579435f3..62ae2d02d 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= tinc PKG_VERSION:= 1.0.23 PKG_RELEASE:= 1 PKG_MD5SUM:= 762c0d47bdf1b33a40b19165d9c2761f -PKG_DESCR:= VPN tunnel daemon +PKG_DESCR:= vpn tunnel daemon PKG_SECTION:= net/security PKG_DEPENDS:= zlib liblzo libopenssl PKG_BUILDDEP:= zlib liblzo openssl -- cgit v1.2.3