mirror of
https://github.com/SoDOff-Project/sodoff.git
synced 2025-10-11 08:18:49 -07:00
Fix Merge Conflict
This commit is contained in:
parent
a74eea66a4
commit
464c3fd32d
@ -8,5 +8,6 @@ public class GameDataPair {
|
|||||||
public string Name { get; set; } = null!;
|
public string Name { get; set; } = null!;
|
||||||
public int Value { get; set; }
|
public int Value { get; set; }
|
||||||
public int DailyValue { get; set; }
|
public int DailyValue { get; set; }
|
||||||
|
[JsonIgnore]
|
||||||
public virtual GameData GameData { get; set; } = null!;
|
public virtual GameData GameData { get; set; } = null!;
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user