Skip to content

Commit 5288873

Browse files
committed
Merge remote-tracking branch 'origin/master'
# Conflicts: # src/TextSerializers/JsonSerializers/Aoxe.NetJson/NetJson.Helper.String.FromJson.cs
2 parents 240a55d + a281163 commit 5288873

1 file changed

Lines changed: 0 additions & 2 deletions

File tree

src/TextSerializers/JsonSerializers/Aoxe.NetJson/NetJson.Helper.String.FromJson.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public static partial class NetJsonHelper
1111
/// <returns></returns>
1212
public static TValue? FromJson<TValue>(string? json, NetJSONSettings? settings = null) =>
1313
string.IsNullOrWhiteSpace(json)
14-
// || json is "null"
1514
? default
1615
: NetJSON
1716
.NetJSON
@@ -26,7 +25,6 @@ public static partial class NetJsonHelper
2625
/// <returns></returns>
2726
public static object? FromJson(Type type, string? json, NetJSONSettings? settings = null) =>
2827
string.IsNullOrWhiteSpace(json)
29-
// || json is "null"
3028
? null
3129
: NetJSON.NetJSON.Deserialize(type, json, settings ?? NetJSONSettings.CurrentSettings);
3230
}

0 commit comments

Comments
 (0)