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/xdm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/xdm') diff --git a/package/xdm/Makefile b/package/xdm/Makefile index 71bd2ad0a..ec8e909e5 100644 --- a/package/xdm/Makefile +++ b/package/xdm/Makefile @@ -7,7 +7,7 @@ PKG_NAME:= xdm PKG_VERSION:= 1.1.11 PKG_RELEASE:= 1 PKG_MD5SUM:= aaf8c3d05d4a1e689d2d789c99a6023c -PKG_DESCR:= X display manager +PKG_DESCR:= display manager PKG_SECTION:= x11/apps PKG_BUILDDEP:= pam PKG_DEPENDS:= xconsole pam xsm -- cgit v1.2.3