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/vrrpd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/vrrpd') diff --git a/package/vrrpd/Makefile b/package/vrrpd/Makefile index 5b37e1f32..ea889f2cb 100644 --- a/package/vrrpd/Makefile +++ b/package/vrrpd/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.0 PKG_RELEASE:= 9 PKG_MD5SUM:= 6d5066ea1a6ced817376ca0f54765447 PKG_DESCR:= virtual router redundancy protocol daemon -PKG_SECTION:= route +PKG_SECTION:= net/route PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=vrrpd/} DISTFILES:= ${PKG_NAME}-${PKG_VERSION}.tar.gz -- cgit v1.2.3