deleted ../Util/Base.hs and monad-control #34

serokell · Feb 26, 2018 · 00056f1 · 00056f1
1 parent ae08708
commit 00056f1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 19 deletions.
diff --git a/serokell-util.cabal b/serokell-util.cabal
@@ -25,7 +25,6 @@ library
 
                        Serokell.Util
                            Serokell.Util.ANSI
-                           Serokell.Util.Base
                            Serokell.Util.Base16
                            Serokell.Util.Base64
                            Serokell.Util.Bench
@@ -67,8 +66,12 @@ library
                      , formatting >= 6.2.0 && < 6.3
                      , hashable >= 1.2.4.0
                      , lens
+<<<<<<< HEAD
                      , log-warper ^>= 1.8.9
                      , monad-control
+=======
+                     , log-warper ^>= 1.8.5
+>>>>>>> deleted ../Util/Base.hs and monad-control #34
                      , mtl
                      , optparse-applicative
                      , parsec

diff --git a/src/Serokell/Util/Base.hs b/src/Serokell/Util/Base.hs