From 795624025a990fd915948747db0edd0346facae4 Mon Sep 17 00:00:00 2001
From: Christian Marie <christian@ponies.io>
Date: Sun, 4 Jan 2015 17:50:44 +1100
Subject: [PATCH] Linting

---
 HLint.hs                    | 7 +++++++
 lib/Data/Aeson/Roundtrip.hs | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)
 create mode 100644 HLint.hs

diff --git a/HLint.hs b/HLint.hs
new file mode 100644
index 0000000..5db46a6
--- /dev/null
+++ b/HLint.hs
@@ -0,0 +1,7 @@
+{-# LANGUAGE PackageImports #-}
+module HLint.HLint where
+
+import           "hint" HLint.Builtin.All
+import           "hint" HLint.Default
+import           "hint" HLint.Dollar
+import           "hint" HLint.Generalise
diff --git a/lib/Data/Aeson/Roundtrip.hs b/lib/Data/Aeson/Roundtrip.hs
index 58e3f43..6173a7b 100644
--- a/lib/Data/Aeson/Roundtrip.hs
+++ b/lib/Data/Aeson/Roundtrip.hs
@@ -181,7 +181,7 @@ instance ProductFunctor JsonBuilder where
         merge x Null = Right x
         merge Null x = Right x
         merge x y = Left $
-            "Don't know how to merge: " ++ show x ++ " <*> " ++ show y
+            "Don't know how to merge: " <> show x <> " <*> " <> show y
 
 instance Alternative JsonBuilder where
     -- Try the left first, then right.