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-xfree86-type1/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/font-xfree86-type1') diff --git a/package/font-xfree86-type1/Makefile b/package/font-xfree86-type1/Makefile index b6efdd9d6..34a7456ca 100644 --- a/package/font-xfree86-type1/Makefile +++ b/package/font-xfree86-type1/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= font-xfree86-type1 PKG_VERSION:= 1.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 89c33c5176cd580de6636ad50ce7777b -PKG_DESCR:= X fonts +PKG_DESCR:= x fonts PKG_SECTION:= x11/fonts PKG_BUILDDEP:= font-util PKG_URL:= http://www.x.org/ -- cgit v1.2.3