From e45f3769bcb637c351707943215a241577f37090 Mon Sep 17 00:00:00 2001 From: Hipposgrumm Date: Sat, 18 Oct 2025 21:28:21 -0600 Subject: [PATCH] Un Merge Conflict --- src/Model/Viking.cs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/Model/Viking.cs b/src/Model/Viking.cs index d67f0df..d02f47e 100644 --- a/src/Model/Viking.cs +++ b/src/Model/Viking.cs @@ -1,5 +1,6 @@ using Microsoft.EntityFrameworkCore; using System.ComponentModel.DataAnnotations; +using System.Text.Json.Serialization; using sodoff.Schema; namespace sodoff.Model; @@ -39,6 +40,7 @@ public class Viking { public virtual ICollection Parties { get; set; } = null!; public virtual ICollection MMORoles { get; set; } = null!; public virtual Neighborhood? Neighborhood { get; set; } = null!; + [JsonIgnore] public virtual ICollection GroupRoles { get; set; } = null!; public virtual ICollection Ratings { get; set; } = null!; public virtual Dragon? SelectedDragon { get; set; }