Commits

Anonymous committed 0a91ea3

Merge release

Comments (0)

Files changed (2)

src/Snap/Snaplet/Auth/Backends/MongoDB.hs

-<<<<<<< HEAD
-
-module Snap.Snaplet.Auth.Backends.MongoDB where
-
-=======
 {-# LANGUAGE TemplateHaskell, TypeFamilies, QuasiQuotes #-}
 
 -- | This module containes MongoDB backend implementation
   --destroy :: MongoDBAuthManager -> AuthUser -> IO ()
   destroy mgr u = withMgr mgr $ do
     withDB' $ deleteWhere ([mongo| { userId: #{userId u}, userLogin: #{userLogin u}, userRememberToken: #{userRememberToken u} } |] :: Document AuthUser)
->>>>>>> release/0.3

src/Snap/Snaplet/MongoDB.hs

 ------------------------------------------------------------------------------
 -- |
 class HasMongoDBState s where
-<<<<<<< HEAD
-    getMongoDBState :: Handler a s MongoDBSnaplet
-    setMongoDBState :: MongoDBSnaplet -> Handler a s ()
-=======
     getMongoDBState :: Handler b s MongoDBSnaplet
     setMongoDBState :: MongoDBSnaplet -> Handler b s ()
->>>>>>> release/0.3
 
     --modifyMongoDBState :: (MongoDBSnaplet -> MongoDBSnaplet) -> s -> s
     --modifyMongoDBState s = setMongoDBState s getMongoDBState