diff options
| author | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2021-01-14 01:57:03 +0300 |
|---|---|---|
| committer | Doug Bunting <6431421+dougbu@users.noreply.github.com> | 2021-01-14 01:57:03 +0300 |
| commit | e165bf0fa1cda123b8a3838d34257f19fc1d236d (patch) | |
| tree | d20d81659792fbcdebef88b5dde7e63b430cc24c /src/AzureIntegration/build/sources.props | |
| parent | 8921af04a326478280cd27ea57bb18496000f646 (diff) | |
| parent | 86249d5abb6b0306c7249007eb42a3e1e3619fd2 (diff) | |
Merge branch 'release/2.1' into 'internal/release/2.1'
- resolve PatchConfig.props conflict
Diffstat (limited to 'src/AzureIntegration/build/sources.props')
0 files changed, 0 insertions, 0 deletions