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/p910nd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/p910nd/Makefile') diff --git a/package/p910nd/Makefile b/package/p910nd/Makefile index 7389132e6..ae2f7e962 100644 --- a/package/p910nd/Makefile +++ b/package/p910nd/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= p910nd PKG_VERSION:= 0.7 PKG_RELEASE:= 10 PKG_MD5SUM:= 7bf752532d26c9106f8039db95df3a6b -PKG_DESCR:= A small non-spooling printer server +PKG_DESCR:= small non-spooling printer server PKG_SECTION:= net/misc PKG_URL:= http://www.etherboot.org/p910nd/ PKG_SITES:= http://www.etherboot.org/p910nd/ -- cgit v1.2.3