From 4c531d279a1aaf495ed1d8d2e329fd72aa84dec2 Mon Sep 17 00:00:00 2001 From: Jason Zhai Date: Wed, 12 Jul 2023 23:40:52 -0700 Subject: [PATCH] Try to resolve source-build patch conflicts --- .../format/0002-Add-explicit-System.Text.Json-dependency.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch index ced7ca579..7bfa0e5e0 100644 --- a/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch +++ b/src/SourceBuild/tarball/patches/format/0002-Add-explicit-System.Text.Json-dependency.patch @@ -40,7 +40,7 @@ index cdfa5f5e..86f02b44 100644 + - + diff --git a/eng/Versions.props b/eng/Versions.props index 27582078..bccaf176 100644 --- a/eng/Versions.props