From 05d715df3ac052fb41a5ab42369d05a3e2a82de3 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 May 2014 13:44:08 +0200 Subject: resolve merge conflict --- package/tinc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/tinc') diff --git a/package/tinc/Makefile b/package/tinc/Makefile index 6c1d15433..0579435f3 100644 --- a/package/tinc/Makefile +++ b/package/tinc/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_MD5SUM:= 762c0d47bdf1b33a40b19165d9c2761f PKG_DESCR:= VPN tunnel daemon PKG_SECTION:= net/security -PKG_DEPENDS:= zlib liblzo libopenssl kmod-tun +PKG_DEPENDS:= zlib liblzo libopenssl PKG_BUILDDEP:= zlib liblzo openssl PKG_URL:= http://www.tinc-vpn.org/ PKG_SITES:= http://www.tinc-vpn.org/packages/ -- cgit v1.2.3