From 45f94fefebea0c276602d3e6411411da19b040c2 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Sun, 23 Apr 2017 19:22:23 +0100 Subject: [PATCH] oop left a merge half-merged --- configure.ac | 4 ---- 1 file changed, 4 deletions(-) diff --git a/configure.ac b/configure.ac index 779f0bc6..f5c2755c 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.5], [vipsip@jiscmail.ac.uk]) ->>>>>>> 8.5 # required for gobject-introspection AC_PREREQ(2.62)