1 files changed, 0 insertions(+), 4 deletions(-)

M src/Main.hs

@@ 11,11 11,7 @@ import qualified Text.HTML.DOM as HTML
 import qualified Text.XML as XML
 import Data.Text (unpack)
 import qualified Data.Map as M
-<<<<<<< HEAD
 import qualified Data.ByteString.Lazy.Char8 as C8
-=======
-import Data.ByteString.Lazy.UTF8 (toString)
->>>>>>> 95cb9bfbe0037a3087fcbbc96f38455fddcc1a7e
 
 import DefaultCSS