diff options
author | David Roundy <droundy@darcs.net> | 2007-06-29 22:16:36 +0200 |
---|---|---|
committer | David Roundy <droundy@darcs.net> | 2007-06-29 22:16:36 +0200 |
commit | d804d114ade5ab048d185b4a72f81a1f525597c5 (patch) | |
tree | 1239b473879e2e1a2546dc6790a53ed0936a3b34 /Square.hs | |
parent | 70f204213b397a0fccfaea287420f032cb7e4e19 (diff) | |
download | XMonadContrib-d804d114ade5ab048d185b4a72f81a1f525597c5.tar.gz XMonadContrib-d804d114ade5ab048d185b4a72f81a1f525597c5.tar.xz XMonadContrib-d804d114ade5ab048d185b4a72f81a1f525597c5.zip |
resolve conflict in Square.
darcs-hash:20070629201636-72aca-3e3b62e6350b19f2dfb2dbf3442d4a68c4da077f.gz
Diffstat (limited to '')
-rw-r--r-- | Square.hs | 8 |
1 files changed, 1 insertions, 7 deletions
@@ -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)] |