From d804d114ade5ab048d185b4a72f81a1f525597c5 Mon Sep 17 00:00:00 2001 From: David Roundy Date: Fri, 29 Jun 2007 22:16:36 +0200 Subject: resolve conflict in Square. darcs-hash:20070629201636-72aca-3e3b62e6350b19f2dfb2dbf3442d4a68c4da077f.gz --- Square.hs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Square.hs') diff --git a/Square.hs b/Square.hs index f19e076..4ccb50e 100644 --- a/Square.hs +++ b/Square.hs @@ -24,8 +24,7 @@ module XMonadContrib.Square ( import XMonad import Graphics.X11.Xlib -import StackSet ( integrate ) -import XMonadContrib.LayoutHelpers ( l2lModDo ) +import XMonadContrib.LayoutHelpers ( l2lModDo, idModify ) -- $usage -- You can use this module with the following in your Config.hs file: @@ -39,11 +38,6 @@ import XMonadContrib.LayoutHelpers ( l2lModDo ) -- > [(twoPane 0.03 0.2,1),(combo [(twoPane 0.03 0.8,1),(square,1)] -- > [(tabbed,3),(tabbed,30),(tabbed,1),(tabbed,1)] -import XMonad -import Graphics.X11.Xlib -import StackSet ( integrate ) -import XMonadContrib.LayoutHelpers ( l2lModDo ) - square :: Layout a square = Layout { doLayout = l2lModDo arrange, modifyLayout = idModify } where arrange :: Rectangle -> [a] -> [(a, Rectangle)] -- cgit v1.2.3