Fix Merge Conflict

This commit is contained in:
Hipposgrumm 2025-09-12 16:01:33 -06:00 committed by GitHub
parent a74eea66a4
commit 464c3fd32d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -8,5 +8,6 @@ public class GameDataPair {
public string Name { get; set; } = null!;
public int Value { get; set; }
public int DailyValue { get; set; }
[JsonIgnore]
public virtual GameData GameData { get; set; } = null!;
}