mirror of
https://github.com/SoDOff-Project/sodoff.git
synced 2025-11-27 10:06:53 -08:00
Roundabout way of solving a merge conflict
This commit is contained in:
parent
e45f3769bc
commit
3e232f9377
@ -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!;
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user