Resolve conflicts between Justin Bogner's C.Desktop patch and latest head.

This commit is contained in:
Daniel Schoepe 2009-10-22 11:58:49 +00:00
parent fc1da0d701
commit 9f16a427e6

View File

@ -167,7 +167,8 @@ import qualified Data.Map as M
-- --
desktopConfig = defaultConfig desktopConfig = defaultConfig
{ logHook = ewmhDesktopsLogHook { startupHook = ewmhDesktopsStartup >> setDefaultCursor xC_left_ptr
, logHook = ewmhDesktopsLogHook
, layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig , layoutHook = desktopLayoutModifiers $ layoutHook defaultConfig
, manageHook = manageHook defaultConfig <+> manageDocks , manageHook = manageHook defaultConfig <+> manageDocks
, handleEventHook = ewmhDesktopsEventHook , handleEventHook = ewmhDesktopsEventHook