Merge pull request #2234 from kleisauke/fix-ci-failures

Fix CI failures
2021-05-03 12:19:21 +01:00 · 2021-05-03 12:19:21 +01:00 · 1423c550cc
parent 70d76117bd 25a268c341
commit 1423c550cc
2 changed files with 1 additions and 4 deletions
--- 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.11.0], [vipsip@jiscmail.ac.uk])
-=======
-AC_INIT([vips], [8.10.7], [vipsip@jiscmail.ac.uk])
->>>>>>> 8.10
 # required for gobject-introspection
 AC_PREREQ(2.62)

--- a/test/test-suite/test_foreign.py
+++ b/test/test-suite/test_foreign.py
@ -44,6 +44,7 @@ class TestForeign:
    def teardown_class(cls):
        shutil.rmtree(cls.tempdir, ignore_errors=True)
        cls.colour = None
+        cls.rgba = None
        cls.mono = None
        cls.rad = None
        cls.cmyk = None