From d36ec105f40845d1f7d771ae796d52912438f910 Mon Sep 17 00:00:00 2001
From: Eyal Lotem <eyal.lotem@gmail.com>
Date: Tue, 7 Jan 2020 12:07:26 +0200
Subject: [PATCH] Bump version: 1.0.8

---
 ChangeLog.md      | 4 ++++
 git-mediate.cabal | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index 9d08df9..63c33de 100644
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,3 +1,7 @@
+# Since 1.0.7
+
+* Fix stack.yaml to use Diff 0.4 as well
+
 # Since 1.0.6
 
 * Upgrade Diff dependency to 0.4
diff --git a/git-mediate.cabal b/git-mediate.cabal
index 93fa3ad..402a8c5 100644
--- a/git-mediate.cabal
+++ b/git-mediate.cabal
@@ -2,7 +2,7 @@
 -- further documentation, see http://haskell.org/cabal/users-guide/
 
 name:                git-mediate
-version:             1.0.7
+version:             1.0.8
 synopsis:            Tool to help resolving git conflicts
 description:         Git conflict resolution has never been easier
                      .