Merge remote-tracking branch 'origin/master'

2020-11-25 10:15:22 -05:00
parent eaa7b04c3d 6131ef23fc
commit 8418770bbf
2 changed files with 2 additions and 2 deletions
--- a/core/src/mindustry/world/blocks/distribution/Conveyor.java
+++ b/core/src/mindustry/world/blocks/distribution/Conveyor.java
@@ -10,7 +10,6 @@ import arc.util.io.*;
 import mindustry.annotations.Annotations.*;
 import mindustry.content.*;
 import mindustry.entities.units.*;
-import mindustry.game.*;
 import mindustry.gen.*;
 import mindustry.graphics.*;
 import mindustry.type.*;