Skip to content

Commit e1426f6

Browse files
committed
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.
1 parent fc65b4f commit e1426f6

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

Diff for: eng/PatchConfig.props

+1
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ Later on, this will be checked using this condition:
7676
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.7' ">
7777
<PackagesInPatch>
7878
Microsoft.AspNetCore.DataProtection.AzureStorage;
79+
Microsoft.AspNetCore.Hosting;
7980
</PackagesInPatch>
8081
</PropertyGroup>
8182
</Project>

0 commit comments

Comments
 (0)