From f14c1fc5515445840d2fbe3350cff0c03eae0b55 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Thu, 29 May 2014 11:40:49 +0200
Subject: resolve merge conflict

---
 package/xcb-util/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/xcb-util/Makefile')

diff --git a/package/xcb-util/Makefile b/package/xcb-util/Makefile
index 836169629..ad5b6c4cb 100644
--- a/package/xcb-util/Makefile
+++ b/package/xcb-util/Makefile
@@ -7,8 +7,8 @@ PKG_NAME:=		xcb-util
 PKG_VERSION:=		0.3.6
 PKG_RELEASE:=		1
 PKG_MD5SUM:=		a8f8f710a202079d1ead532abd061672
-PKG_DESCR:=		XCB utils
-PKG_SECTION:=		x11/apps
+PKG_DESCR:=		libraries which sit on top of libxcb
+PKG_SECTION:=		x11/libs
 PKG_SITES:=		http://xcb.freedesktop.org/dist/
 
 DISTFILES:=		${PKG_NAME}-${PKG_VERSION}.tar.gz
-- 
cgit v1.2.3