From e8525ffaf0a251d1219e4e4bfa45179537fb663b Mon Sep 17 00:00:00 2001
From: LA_DI_DA <11174151+0O0o0oOoO00@users.noreply.github.com>
Date: Sun, 15 Sep 2024 22:14:03 +0800
Subject: [PATCH] fix: merge mistake in module/exercise/combat.py

---
 module/exercise/combat.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/exercise/combat.py b/module/exercise/combat.py
index b5deb2706..da05658b6 100644
--- a/module/exercise/combat.py
+++ b/module/exercise/combat.py
@@ -7,7 +7,7 @@ from module.exercise.opponent import OPPONENT, OpponentChoose
 from module.ui.assets import EXERCISE_CHECK
 
 
-class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment):
+class ExerciseCombat(HpDaemon, OpponentChoose, ExerciseEquipment, Combat):
     def _in_exercise(self):
         return self.appear(EXERCISE_CHECK, offset=(20, 20))