From 6343e03305d04959e3806addc2a0433ccd31a55e Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Wed, 2 Aug 2017 12:07:41 +0100
Subject: [PATCH] oops, missed a ====

---
 configure.ac | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index cf05d455..7ed71f17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,11 +2,7 @@
 
 # also update the version number in the m4 macros below
 
-<<<<<<< HEAD
 AC_INIT([vips], [8.6.0], [vipsip@jiscmail.ac.uk])
-=======
-AC_INIT([vips], [8.5.8], [vipsip@jiscmail.ac.uk])
->>>>>>> 8.5
 # required for gobject-introspection
 AC_PREREQ(2.62)