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/vgp/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/vgp') diff --git a/package/vgp/Makefile b/package/vgp/Makefile index 722843182..2600db1fe 100755 --- a/package/vgp/Makefile +++ b/package/vgp/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= vgp PKG_VERSION:= 0.2.1 PKG_RELEASE:= 1 PKG_MD5SUM:= b8c25b5dfcb944f78bbc584be9c230c7 -PKG_DESCR:= daemon working like Cisco HSRP +PKG_DESCR:= daemon working like cisco hsrp PKG_SECTION:= net/misc PKG_URL:= http://vgpd.freaknet.org/ PKG_SITES:= http://vgpd.freaknet.org/files/ -- cgit v1.2.3