diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 11:40:49 +0200 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-29 21:56:31 +0200 |
commit | f14c1fc5515445840d2fbe3350cff0c03eae0b55 (patch) | |
tree | 7617315e619f969c13e79c1f44c2428871719357 /package/xdm | |
parent | 365261c9db442081290b7d21aba6201244af294d (diff) |
resolve merge conflict
Diffstat (limited to 'package/xdm')
-rw-r--r-- | package/xdm/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |