Projects >> Terasology >>fbf546fdd312da8c924dfe84dd56a1e652d8f26e

Chunk
Conflicting content 
import org.terasology.logic.inventory.InventoryManager;
import org.terasology.logic.permission.PermissionManager;
import org.terasology.logic.players.LocalPlayer;
<<<<<<< HEAD
import org.terasology.math.geom.Vector3f;
import org.terasology.math.geom.Vector3i;
=======
>>>>>>> ce1262e6d817e8b4909bcb4581ff85c1c1f1d7a8
import org.terasology.network.ClientComponent;
import org.terasology.registry.In;
import org.terasology.registry.Share;
Solution content 
import org.terasology.logic.inventory.InventoryManager;
import org.terasology.logic.permission.PermissionManager;
import org.terasology.logic.players.LocalPlayer;
import org.terasology.network.ClientComponent;
import org.terasology.registry.In;
import org.terasology.registry.Share;
File
BlockCommands.java
Developer's decision
Version 2
Kind of conflict
Import