From 4fb7b6eb328ec2b5277e5498c2db9e0283489d25 Mon Sep 17 00:00:00 2001 From: Michael Simons Date: Fri, 21 Apr 2023 20:24:54 +0000 Subject: [PATCH] Resolve format patch conflict --- ...-MicrosoftNetCompilersToolsetVersion-instead-of.patch | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch index 4b35b4adc..acbd6003d 100644 --- a/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch +++ b/src/SourceBuild/patches/format/0001-Use-MicrosoftNetCompilersToolsetVersion-instead-of.patch @@ -41,15 +41,6 @@ diff --git a/eng/Versions.props b/eng/Versions.props index 2d325ec6..e1bc7022 100644 --- a/eng/Versions.props +++ b/eng/Versions.props -@@ -21,7 +21,7 @@ - 3.3.4 - 7.0.0-rc.1.22426.10 - -- 4.5.0-3.22602.7 -+ 4.5.0-3.22602.7 - - 2.0.0-beta4.22564.1 - 0.4.0-alpha.22564.1 @@ -35,7 +35,7 @@ 6.6.0-preview.3.61