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/xproto/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'package/xproto')

diff --git a/package/xproto/Makefile b/package/xproto/Makefile
index 9358f87e7..b41a1507c 100644
--- a/package/xproto/Makefile
+++ b/package/xproto/Makefile
@@ -6,8 +6,8 @@ include $(TOPDIR)/rules.mk
 PKG_NAME:=		xproto
 PKG_VERSION:=		7.0.23
 PKG_RELEASE:=		1
-PKG_DESCR:=		X Window System Core Protocol headers
-PKG_SECTION:=		devel
+PKG_DESCR:=		x window system core protocol headers
+PKG_SECTION:=		dev/header
 PKG_MD5SUM:=		7ab1239930563a352cb3552fd2db4140
 PKG_BUILDDEP:=		xproto-host
 PKG_SITES:=		${MASTER_SITE_XORG}
-- 
cgit v1.2.3