From 1b672513ae95924eece10c5614d27734b6efc2a8 Mon Sep 17 00:00:00 2001
From: Pilzinsel64 <pilzinsel64@gmx.de>
Date: Sat, 5 Nov 2022 15:19:40 +0100
Subject: [PATCH] fix merge conflicts

---
 PlayerTags/Configuration/PluginConfiguration.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/PlayerTags/Configuration/PluginConfiguration.cs b/PlayerTags/Configuration/PluginConfiguration.cs
index 6c1b5c6..7c66f13 100644
--- a/PlayerTags/Configuration/PluginConfiguration.cs
+++ b/PlayerTags/Configuration/PluginConfiguration.cs
@@ -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() },