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/setxkbmap/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/setxkbmap') diff --git a/package/setxkbmap/Makefile b/package/setxkbmap/Makefile index 71c6fafb0..0ede9cfbc 100644 --- a/package/setxkbmap/Makefile +++ b/package/setxkbmap/Makefile @@ -8,7 +8,7 @@ PKG_VERSION:= 1.3.0 PKG_RELEASE:= 1 PKG_MD5SUM:= 57380d069021c6b7d873bfab803e3105 PKG_DESCR:= set keyboard utility -PKG_SECTION:= x11/apps +PKG_SECTION:= x11/utils PKG_DEPENDS:= libxkbfile PKG_SITES:= ${MASTER_SITE_XORG} -- cgit v1.2.3