From 0c4a40e82fecb81d958381d0f53c093dbb4af865 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Wed, 4 Jan 2017 10:18:54 +0000
Subject: [PATCH] oop missed a merge conflict

---
 libvips/include/vips/util.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/libvips/include/vips/util.h b/libvips/include/vips/util.h
index b8653621..027acb11 100644
--- a/libvips/include/vips/util.h
+++ b/libvips/include/vips/util.h
@@ -135,7 +135,6 @@ G_STMT_START { \
 	} \
 } G_STMT_END
 
-<<<<<<< HEAD
 /* The g_info() macro was added in 2.40.
  */
 #ifndef g_info
@@ -145,8 +144,6 @@ G_STMT_START { \
 	 g_log( G_LOG_DOMAIN, G_LOG_LEVEL_INFO, __VA_ARGS__ )
 #endif
 
-=======
->>>>>>> master
 /* Various integer range clips. Record over/under flows.
  */
 #define VIPS_CLIP_UCHAR( V, SEQ ) \