Merge branch '1.11' into 1.12

mchorse · Mar 23, 2020 · 02f3da1 · 02f3da1
2 parents d84904a + 1bc8375
commit 02f3da1
Showing 1 changed file with 0 additions and 1 deletion.
diff --git a/...ava/mchorse/blockbuster/client/gui/dashboard/panels/model_editor/GuiModelEditorPanel.java b/...ava/mchorse/blockbuster/client/gui/dashboard/panels/model_editor/GuiModelEditorPanel.java
@@ -4,7 +4,6 @@
 import java.util.Map;
 import java.util.Objects;
 
-import com.sun.xml.internal.bind.v2.runtime.reflect.Lister;
 import mchorse.blockbuster.Blockbuster;
 import mchorse.blockbuster.ClientProxy;
 import mchorse.blockbuster.CommonProxy;