From cc5946844de70b9ead72394d76e5781acd007029 Mon Sep 17 00:00:00 2001 From: MichaelSimons Date: Fri, 30 Sep 2022 13:38:07 +0000 Subject: [PATCH] Resolve patch conflict --- .../tarball/patches/runtime/0003-Update-compiler-version.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/runtime/0003-Update-compiler-version.patch b/src/SourceBuild/tarball/patches/runtime/0003-Update-compiler-version.patch index e26213b6b..0af4d662a 100644 --- a/src/SourceBuild/tarball/patches/runtime/0003-Update-compiler-version.patch +++ b/src/SourceBuild/tarball/patches/runtime/0003-Update-compiler-version.patch @@ -27,7 +27,7 @@ index fe8aac648cd..2f16902347b 100644 + 4.4.0-3.22472.1 0.2.0 - 7.0.100-rc.1.22402.1 + 8.0.100-alpha.1.22462.3 diff --git a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs b/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs index c55ee607da7..4e1246b481b 100644 --- a/src/coreclr/System.Private.CoreLib/src/System/Reflection/RuntimeMethodInfo.CoreCLR.cs