Resolve minor conflict in xmonad-contrib.cabal
Resolve minor conflict in xmonad-contrib.cabal

Ignore-this: 24ae68c08107a574199b055989d38347

darcs-hash:20150306175436-3948e-931d4b67490a05acb335c237e11e699ba4487a44

yzhou61/xmonad-contrib,yzhou61/xmonad-contrib,yzhou61/xmonad-contrib