fix merge conflicts

This commit is contained in:
2022-11-05 15:19:40 +01:00
parent 5343b5967b
commit 1b672513ae

View File

@@ -33,7 +33,7 @@ namespace PlayerTags.Configuration
}
[JsonProperty("GeneralOptionsV2")]
public Dictionary<ActivityContext, GeneralOptionsClass> GeneralOptions = new Dictionary<ActivityContext, GeneralOptionsClass>()
public Dictionary<ActivityType, GeneralOptionsClass> GeneralOptions = new()
{
{ ActivityType.None, new GeneralOptionsClass() },
{ ActivityType.PveDuty, new GeneralOptionsClass() },