From 55478a6a7483f6da7b756cb7cfea1d724f3b7203 Mon Sep 17 00:00:00 2001
From: Adrian Cochrane <adrian@openwork.nz>
Date: Sat, 13 Jul 2019 16:59:35 +1200
Subject: [PATCH] Fix merge conflict on imports.

---
 src/Main.hs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Main.hs b/src/Main.hs
index f30e495..ed0d9b8 100644
--- a/src/Main.hs
+++ b/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
 
-- 
2.30.2