Merge

hansonkd · Jul 26, 2014 · bd1e65a · bd1e65a
2 parents dd58130 + 07ee392
commit bd1e65a
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -8,4 +8,3 @@ workshop/
 *.chi
 *.chs.h
 .virthualenv
-workshop
diff --git a/wheb-base/Wheb.cabal b/wheb-base/Wheb.cabal
@@ -109,7 +109,6 @@ library
   default-language: Haskell2010
   exposed-modules:     Web.Wheb, Web.Wheb.Cookie, Web.Wheb.InitM, Web.Wheb.Internal, Web.Wheb.Routes, Web.Wheb.Types, Web.Wheb.Utils, Web.Wheb.WhebT, Web.Wheb.Plugins.Auth, Web.Wheb.Plugins.Session, Web.Wheb.Plugins.Debug.MemoryBackend
 
-<<<<<<< HEAD
   build-depends:       base >= 4.7 && < 4.8, 
                        text >= 1.0 && < 1.2, 
                        transformers >= 0.4 && < 0.5, 

diff --git a/wheb-base/src/Web/Wheb/Internal.hs b/wheb-base/src/Web/Wheb/Internal.hs
@@ -50,7 +50,6 @@ optsToApplication opts@(WhebOptions {..}) runIO r respond = do
                                   let hData = mwData { routeParams = params }
                                   runWhebHandler opts h st hData 
                               Nothing          -> return $ Left Error404
-
   finished <- either handleError return res
   respond finished
   where baseData   = HandlerData startingCtx r ([], []) [] opts