Skip to content

Commit 1b793a4

Browse files
committed
fix: resolve merge conflict errors
1 parent 78b8d88 commit 1b793a4

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiPrimaryErrorMessageExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void Write(IOpenApiWriter writer, OpenApiSpecVersion specVersion)
4040
/// <returns>The <see cref="OpenApiPrimaryErrorMessageExtension"/>.</returns>
4141
public static OpenApiPrimaryErrorMessageExtension Parse(JsonNode source)
4242
{
43-
if (source is not JsonNode rawObject) throw new ArgumentOutOfRangeException(nameof(source));
43+
if (source is not JsonValue rawObject) throw new ArgumentOutOfRangeException(nameof(source));
4444
return new()
4545
{
4646
IsPrimaryErrorMessage = rawObject.TryGetValue<bool>(out var value) && value

src/Microsoft.OpenApi/MicrosoftExtensions/OpenApiReservedParameterExtension.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public bool? IsReserved
4242
/// <returns></returns>
4343
public static OpenApiReservedParameterExtension Parse(JsonNode source)
4444
{
45-
if (source is not JsonNode rawBoolean) throw new ArgumentOutOfRangeException(nameof(source));
45+
if (source is not JsonValue rawBoolean) throw new ArgumentOutOfRangeException(nameof(source));
4646
return new()
4747
{
4848
IsReserved = rawBoolean.TryGetValue<bool>(out var value) && value

0 commit comments

Comments
 (0)