resolve conflict in Square.

darcs-hash:20070629201636-72aca-3e3b62e6350b19f2dfb2dbf3442d4a68c4da077f.gz

1 files changed, 1 insertions, 7 deletions

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)]