This repository was archived by the owner on Jul 30, 2024. It is now read-only.
Commit 2719026
committed
Merge branch 'master' into dev
# Conflicts:
# src/ArchivePackages/packages.config
# src/NuGet.Jobs.Common/packages.config
# src/NuGet.SupportRequests.Notifications/NuGet.SupportRequests.Notifications.csproj
# src/Stats.CreateAzureCdnWarehouseReports/packages.config
# src/Stats.ImportAzureCdnStatistics/packages.config
# src/Tests.Logger/App.config
# src/UpdateLicenseReports/packages.config
# src/Validation.Callback.Vcs/Web.config
# tests/Tests.Stats.CollectAzureCdnLogs/Tests.Stats.CollectAzureCdnLogs.csproj2 files changed
Lines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
26 | | - | |
| 26 | + | |
27 | 27 | | |
28 | 28 | | |
29 | 29 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5 | 5 | | |
6 | 6 | | |
7 | 7 | | |
8 | | - | |
| 8 | + | |
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
| |||
52 | 52 | | |
53 | 53 | | |
54 | 54 | | |
55 | | - | |
| 55 | + | |
56 | 56 | | |
57 | 57 | | |
58 | 58 | | |
| |||
0 commit comments