From f562dfdd5ba47fb7d12155edbaaebd68d89532fd Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Thu, 3 Jul 2014 09:13:01 +0100
Subject: [PATCH] oops

---
 ChangeLog | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 9c805abc..31f38483 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,3 @@
-<<<<<<< HEAD
-26/6/14 started 7.40.2
-- fixes to help freebsd
-=======
 30/6/14 started 7.40.3
 - fix interlaced thumbnails in vipsthumbnail, thanks lovell
 - add --properties argument to dzsave, thanks bgilbert
@@ -12,7 +8,6 @@
 - added --enable-docs configure option to help freebsd
 - removed a bash-ism from configure to help freebsd
 - don't assume GType fits in an int to help freebsd
->>>>>>> c5fbe6daa642b522c54b6912b22649f59c8d237f
 
 24/6/14 started 7.40.1
 - revise man.1 pages