From 3e232f93777a9a8be676a8ef4a48f5fb740a63d3 Mon Sep 17 00:00:00 2001
From: Hipposgrumm <hipposgrumm@gmail.com>
Date: Sat, 18 Oct 2025 21:30:24 -0600
Subject: [PATCH] Roundabout way of solving a merge conflict

---
 src/Model/Viking.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Model/Viking.cs b/src/Model/Viking.cs
index d02f47e..1bcc467 100644
--- a/src/Model/Viking.cs
+++ b/src/Model/Viking.cs
@@ -42,6 +42,7 @@ public class Viking {
     public virtual Neighborhood? Neighborhood { get; set; } = null!;
     [JsonIgnore]
     public virtual ICollection<GroupViking> GroupRoles { get; set; } = null!;
+    public virtual ICollection<Group> Groups { get; set; } = null!;
     public virtual ICollection<Rating> Ratings { get; set; } = null!;
     public virtual Dragon? SelectedDragon { get; set; }
     public virtual ICollection<UserMissionData> UserMissions { get; set; } = null!;