Source

snaplet-mongoDB / src / Snap / Snaplet / MongoDB.hs

Diff from to

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
 
 ------------------------------------------------------------------------------
 -- |
+<<<<<<< HEAD
+instance HasMongoDBState s => MonadMongoDB (Handler a s) where
+=======
 instance HasMongoDBState s => MonadMongoDB (Handler b s) where
+>>>>>>> release/0.3
   withDB run = do
     (MongoDBSnaplet pool db) <- getMongoDBState
     epipe <- liftIO $ runErrorT $ MPool.aResource pool