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/font-util/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'package/font-util') diff --git a/package/font-util/Makefile b/package/font-util/Makefile index eb1f3aad8..d0dad32fb 100644 --- a/package/font-util/Makefile +++ b/package/font-util/Makefile @@ -7,8 +7,8 @@ PKG_NAME:= font-util PKG_VERSION:= 1.1.1 PKG_RELEASE:= 3 PKG_MD5SUM:= 171ebfd3733aeae3af91ad57d126d29d -PKG_DESCR:= font util -PKG_SECTION:= x11/apps +PKG_DESCR:= font utility +PKG_SECTION:= x11/fonts PKG_URL:= http://www.x.org/ PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3