SoDOff-Project/sodoff
1
0
Fork 1
mirror of https://github.com/SoDOff-Project/sodoff.git synced 2025-11-27 10:06:53 -08:00
Code Issues Packages Projects Releases Wiki Activity

Roundabout way of solving a merge conflict

Browse Source
This commit is contained in:
Hipposgrumm 2025-10-18 21:30:24 -06:00
parent e45f3769bc
commit 3e232f9377
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Model/Viking.cs
View File

@ -42,6 +42,7 @@ public class Viking {
public virtual Neighborhood? Neighborhood { get; set; } = null!; public virtual Neighborhood? Neighborhood { get; set; } = null!;
[JsonIgnore] [JsonIgnore]
public virtual ICollection<GroupViking> GroupRoles { get; set; } = null!; 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 ICollection<Rating> Ratings { get; set; } = null!;
public virtual Dragon? SelectedDragon { get; set; } public virtual Dragon? SelectedDragon { get; set; }
public virtual ICollection<UserMissionData> UserMissions { get; set; } = null!; public virtual ICollection<UserMissionData> UserMissions { get; set; } = null!;