From b506c7fb53c5307eada49a26fc9b3263e91f3eed Mon Sep 17 00:00:00 2001 From: Oleg Agafonov Date: Tue, 22 Dec 2020 17:33:36 +0400 Subject: [PATCH] Merge fix --- Mage.Client/src/main/java/mage/client/game/GamePanel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Mage.Client/src/main/java/mage/client/game/GamePanel.java b/Mage.Client/src/main/java/mage/client/game/GamePanel.java index f04ffbd738..2151f75e62 100644 --- a/Mage.Client/src/main/java/mage/client/game/GamePanel.java +++ b/Mage.Client/src/main/java/mage/client/game/GamePanel.java @@ -102,7 +102,7 @@ public final class GamePanel extends javax.swing.JPanel { private boolean initComponents; - private final Timer resizeTimer; + private Timer resizeTimer; // can't be final private enum PopUpMenuType { TRIGGER_ORDER