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.
This commit is contained in:
parent
fc65b4fd86
commit
e1426f6bdf
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Reference in New Issue