From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 23 May 2019 09:41:18 +0000 (+0200)
Subject: Merge branch 'PHP-7.4'
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=5aa91d573265a222b4b2624c5efb0f5a56ab5385;p=php

Merge branch 'PHP-7.4'

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

5aa91d573265a222b4b2624c5efb0f5a56ab5385