[Resolved conflict
tobias@goedderz.info**20140717092644
 Ignore-this: 36dbd79b41fdeb921460e200e88e5d7d
] hunk ./src/Igor2/Logging/Logger.hs 6
-    tp,ts,lift4, lputStrLn,lputDoc,
-    
+    tp,ts,
+
hunk ./src/Igor2/Logging/Logger.hs 49
-ts s = \x -> (trace $ s ++ (show $ x)) x
-
-lift4 = lift . lift . lift . lift
-lputStrLn = lift4 . putStrLn
-lputDoc = lift4 . putDoc
+ts s = \x -> (trace $ s ++ show x) x