From: Nikita Popov <nikita.ppv@gmail.com>
Date: Thu, 6 Aug 2020 10:35:37 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3f0f35fd7c6f87d1dbe36ce2c6b18e80c3d92f6;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix file clash in zlib test
---

b3f0f35fd7c6f87d1dbe36ce2c6b18e80c3d92f6