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/cups/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/cups') diff --git a/package/cups/Makefile b/package/cups/Makefile index 0272d30e6..6efa5b327 100644 --- a/package/cups/Makefile +++ b/package/cups/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= cups PKG_VERSION:= 1.7.1 PKG_RELEASE:= 4 PKG_MD5SUM:= 55277c40fd4b7183dc3671d39c5c42b7 -PKG_DESCR:= Common Unix Printing System +PKG_DESCR:= common unix printing system PKG_SECTION:= net/misc PKG_DEPENDS:= zlib libpthread libstdcxx PKG_BUILDDEP:= cups-host zlib -- cgit v1.2.3