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/aiccu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/aiccu') diff --git a/package/aiccu/Makefile b/package/aiccu/Makefile index 407c3a65c..155da938f 100644 --- a/package/aiccu/Makefile +++ b/package/aiccu/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 11 PKG_MD5SUM:= c9bcc83644ed788e22a7c3f3d4021350 PKG_DESCR:= SixXS Automatic IPv6 Connectivity Client Utility PKG_SECTION:= ipv6 -PKG_DEPENDS:= kmod-ipv6 kmod-tun libpthread +PKG_DEPENDS:= libpthread PKG_URL:= http://www.sixxs.net/ PKG_SITES:= http://www.sixxs.net/archive/sixxs/aiccu/unix/ -- cgit v1.2.3