Fix

Nigusu-Allehu · Nigusu-Allehu · commit 01dc4d3408f5 · 2026-04-17T11:35:15.000-07:00
diff --git a/src/NuGet.Core/NuGet.Protocol/Utility/JsonContext.cs b/src/NuGet.Core/NuGet.Protocol/Utility/JsonContext.cs
@@ -17,11 +17,7 @@ namespace NuGet.Protocol.Utility
     [JsonSerializable(typeof(HttpFileSystemBasedFindPackageByIdResource.FlatContainerVersionList))]
     [JsonSerializable(typeof(IReadOnlyList<V3VulnerabilityIndexEntry>), TypeInfoPropertyName = "VulnerabilityIndex")]
     [JsonSerializable(typeof(CaseInsensitiveDictionary<IReadOnlyList<PackageVulnerabilityInfo>>), TypeInfoPropertyName = "VulnerabilityPage")]
-<<<<<<< Updated upstream
-=======
     [JsonSerializable(typeof(AutoCompleteModel))]
-    [JsonSerializable(typeof(ServiceIndexModel))]
->>>>>>> Stashed changes
     internal partial class JsonContext : JsonSerializerContext
     {
     }

Original file line number	Diff line number	Diff line change
`@@ -17,11 +17,7 @@ namespace NuGet.Protocol.Utility`
`17`	`17`	`[JsonSerializable(typeof(HttpFileSystemBasedFindPackageByIdResource.FlatContainerVersionList))]`
`18`	`18`	`[JsonSerializable(typeof(IReadOnlyList<V3VulnerabilityIndexEntry>), TypeInfoPropertyName = "VulnerabilityIndex")]`
`19`	`19`	`[JsonSerializable(typeof(CaseInsensitiveDictionary<IReadOnlyList<PackageVulnerabilityInfo>>), TypeInfoPropertyName = "VulnerabilityPage")]`
`20`		`-<<<<<<< Updated upstream`
`21`		`-=======`
`22`	`20`	`[JsonSerializable(typeof(AutoCompleteModel))]`
`23`		`- [JsonSerializable(typeof(ServiceIndexModel))]`
`24`		`->>>>>>> Stashed changes`
`25`	`21`	`internal partial class JsonContext : JsonSerializerContext`
`26`	`22`	`{`
`27`	`23`	`}`