From 3d5b0b814f3daa45f0b34a5088666a95652edeb2 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 20 Jul 2018 13:58:27 +0100
Subject: [PATCH] merge in test suite

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

diff --git a/ChangeLog b/ChangeLog
index 8f9f66a9..5b1db846 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -31,13 +31,10 @@
 - add Mitchell kernel
 - pyramid builders have a choice of 2x2 shrinkers [harukizaemon]
 - add `palette` option to pngsave [felixbuenemann]
-<<<<<<< HEAD
 - add basic nifti load/save support
-=======
 - support writing string-valued fields via libexif
 - paste in the test suite from pyvips
 - get EXIF tag names from tag plus ifd [@Nan619]
->>>>>>> master
 
 12/3/18 started 8.6.4
 - better fitting of fonts with overhanging edges [Adrià]