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/nut/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/nut/Makefile') diff --git a/package/nut/Makefile b/package/nut/Makefile index 0ff92d8b0..b4918d9e4 100644 --- a/package/nut/Makefile +++ b/package/nut/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= nut PKG_VERSION:= 2.4.1 PKG_RELEASE:= 1 PKG_MD5SUM:= 609ebaf2123fc7171d25a6c742dd7d66 -PKG_DESCR:= Network UPS Tools +PKG_DESCR:= network ups tools PKG_SECTION:= net/misc PKG_URL:= http://www.networkupstools.org/ PKG_SITES:= http://www.networkupstools.org/source/2.4/ -- cgit v1.2.3