From 72e6cc1059674a855ff08963cbe5b80330ea277b Mon Sep 17 00:00:00 2001
From: Tran Hai Nam <namtran.brewmonster@gmail.com>
Date: Wed, 27 May 2026 14:49:22 +0700
Subject: [PATCH] fix skill panel

---
 Assets/PerfectWorld/Scripts/Debug/SkillTriggerPanel.cs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/Assets/PerfectWorld/Scripts/Debug/SkillTriggerPanel.cs b/Assets/PerfectWorld/Scripts/Debug/SkillTriggerPanel.cs
index f1130e2007..05a9573489 100644
--- a/Assets/PerfectWorld/Scripts/Debug/SkillTriggerPanel.cs
+++ b/Assets/PerfectWorld/Scripts/Debug/SkillTriggerPanel.cs
@@ -93,12 +93,8 @@ namespace BrewMonster
         private void Awake()
         {
             Instance = this;
-<<<<<<< HEAD
-            SkillStubs.Init();
-=======
             if (channelCancelButton != null)
                 channelCancelButton.onClick.AddListener(CancelChanneling);
->>>>>>> 6fde1d1583 (Add requirement for play skill)
         }
 
         private void OnDestroy()