Fix: [FGOpy] Solve merge conflicts

submodule/AlasFpyBridge/module/FGOpy.py

@@ -4,7 +4,7 @@ import shutil
 import time
 from threading import Lock
 
-from deploy.config import DeployConfig
+from deploy.Windows.config import DeployConfig
 from module.logger import logger
 from submodule.AlasFpyBridge.module.utils.headlessCliApplication import HeadlessCliApplication
 

submodule/AlasFpyBridge/module/config/config.py

@@ -27,7 +27,7 @@ class FgoConfig(AzurLaneConfig, ConfigUpdater, GeneratedConfig):
     # @override
     def bind(self, func, func_set=None):
         if func_set is None:
-            func_set = {"Fpy"}
+            func_set = ["Fpy"]
         super().bind(func, func_set)
 
     # @override