From: Peter Kokot <peterkokot@gmail.com>
Date: Mon, 13 May 2019 01:53:49 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha1~285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=addf2ad5fd9c8f6db394f01d282eb6ab3889be78;p=php

Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Convert CRLF to LF
---

addf2ad5fd9c8f6db394f01d282eb6ab3889be78
diff --cc ext/simplexml/tests/sxe.dtd
index b75a7922b0,24ae83275e..24ae83275e
mode 100644,100755..100644
--- a/ext/simplexml/tests/sxe.dtd
+++ b/ext/simplexml/tests/sxe.dtd