From 15c94cea44de9bf1600442a13cfefd75e8ad8ed7 Mon Sep 17 00:00:00 2001 From: sunshineinabox Date: Wed, 26 Jul 2023 21:09:23 -0700 Subject: [PATCH] Resolve Conflict --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1fd347d39..450f298b6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -20,7 +20,7 @@ - +