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/bridge-utils/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/bridge-utils/Makefile') diff --git a/package/bridge-utils/Makefile b/package/bridge-utils/Makefile index 38f5ee38f..bfe4722c8 100644 --- a/package/bridge-utils/Makefile +++ b/package/bridge-utils/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.5 PKG_RELEASE:= 2 PKG_MD5SUM:= ec7b381160b340648dede58c31bb2238 PKG_DESCR:= ethernet bridging tools -PKG_SECTION:= bridge +PKG_SECTION:= net/route PKG_BUILDDEP:= autotool PKG_URL:= http://www.linuxfoundation.org/en/Net:Bridge PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=bridge/} -- cgit v1.2.3