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/6tunnel/Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'package/6tunnel') diff --git a/package/6tunnel/Makefile b/package/6tunnel/Makefile index 5cc43e359..b34909e5b 100644 --- a/package/6tunnel/Makefile +++ b/package/6tunnel/Makefile @@ -10,7 +10,6 @@ PKG_MD5SUM:= 74e02d4f0704b3083a01feda66033449 PKG_DESCR:= IPv4/IPv6 tunnel proxy PKG_SECTION:= ipv6 PKG_BUILDDEP:= autotool -PKG_DEPENDS:= kmod-ipv6 PKG_URL:= http://toxygen.net/6tunnel/ PKG_SITES:= http://toxygen.net/6tunnel/ -- cgit v1.2.3