merge in test suite

2018-07-20 13:58:27 +01:00 · 2018-07-20 13:58:27 +01:00 · 3d5b0b814f
commit 3d5b0b814f
parent 3201b4373d
1 changed files with 0 additions and 3 deletions
--- a/3
+++ b/3
@ -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à]