From e1426f6bdf0ca7501a5dc8258891075e6c7abe1c Mon Sep 17 00:00:00 2001
From: Mikael Mengistu <mimengis@microsoft.com>
Date: Mon, 12 Aug 2019 16:40:16 +0000
Subject: [PATCH] Merged PR 2582: Fixing merge conflict between release/2.2 and
 internal/release/2.2

Changes were made to the `PatchConfig.props` files in the internal and public branches. The change to the internal branch was made before the change in the public branch which caused the conflict and broke mirroring.
---
 eng/PatchConfig.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 1f005216dc7e..ca3fab2ab214 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -76,6 +76,7 @@ Later on, this will be checked using this condition:
   <PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.7' ">
     <PackagesInPatch>
       Microsoft.AspNetCore.DataProtection.AzureStorage;
+      Microsoft.AspNetCore.Hosting;
     </PackagesInPatch>
   </PropertyGroup>
 </Project>