Skip to content

Commit

Permalink
Merged PR 2582: Fixing merge conflict between release/2.2 and interna…
Browse files Browse the repository at this point in the history
…l/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.
  • Loading branch information
mikaelm12 committed Aug 12, 2019
1 parent fc65b4f commit e1426f6
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions eng/PatchConfig.props
Original file line number Diff line number Diff line change
Expand Up @@ -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>

0 comments on commit e1426f6

Please sign in to comment.