From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Fri, 20 Mar 2020 07:57:43 +0000 (+0100)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=825384c478a47fda8c3f26652aed1a9f7fc1ac84;p=php

Merge branch 'PHP-7.4'

* PHP-7.4:
  Fix potential test conflict
---

825384c478a47fda8c3f26652aed1a9f7fc1ac84