From ba295dc7dc63bc1b8350785bf8d0e44248e150b1 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 30 Nov 2021 01:16:28 +0000 Subject: [PATCH 1/2] Always use LF in .neon files --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index bec13fa0a..20ef6a046 100644 --- a/.gitattributes +++ b/.gitattributes @@ -4,6 +4,7 @@ *.sh text eol=lf *.txt text eol=lf *.properties text eol=lf +*.neon text eol=lf *.bat text eol=crlf *.cmd text eol=crlf *.ps1 text eol=crlf From 8079ae341a84f3df65e578b5b7166a4311ba4688 Mon Sep 17 00:00:00 2001 From: "Dylan K. Taylor" Date: Tue, 30 Nov 2021 01:19:14 +0000 Subject: [PATCH 2/2] Updated build/php submodule to pmmp/php-build-scripts@bd329dba08242b6ecb99ef7fbf9a0031dcbbb3ff --- build/php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/php b/build/php index a59722c67..bd329dba0 160000 --- a/build/php +++ b/build/php @@ -1 +1 @@ -Subproject commit a59722c6764ce82e91a1ec2a9aa158e060022bed +Subproject commit bd329dba08242b6ecb99ef7fbf9a0031dcbbb3ff