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/mrd6/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/mrd6/Makefile') diff --git a/package/mrd6/Makefile b/package/mrd6/Makefile index 9b39f4f08..8c1582aa7 100644 --- a/package/mrd6/Makefile +++ b/package/mrd6/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= mrd6 PKG_VERSION:= 0.9.6 PKG_RELEASE:= 1 PKG_MD5SUM:= 93ada53bb414b9d622f80a717bc2694b -PKG_DESCR:= IPv6 multicast routing daemon -PKG_SECTION:= ipv6 +PKG_DESCR:= ipv6 multicast routing daemon +PKG_SECTION:= net/ipv6 PKG_SITES:= http://www.openadk.org/distfiles/ PKG_CXX:= MRD6 -- cgit v1.2.3