Projects >> SpoutcraftPlugin >>e5d016f1c2b905524524eeb288013d9f6b5eab2a

Chunk
Conflicting content 
import org.getspout.spout.player.SpoutCraftPlayer;
import org.getspout.spoutapi.SpoutManager;
import org.getspout.spoutapi.event.spout.SpoutCraftEnableEvent;
<<<<<<< HEAD
import org.getspout.spoutapi.packet.PacketAllowVisualCheats;
=======
import org.getspout.spoutapi.packet.PacketCacheHashUpdate;
>>>>>>> bbd64b3aa049503f0b95873df180251862423122
import org.getspout.spoutapi.packet.PacketWorldSeed;
import org.getspout.spoutapi.player.SpoutPlayer;
Solution content 
import org.getspout.spout.player.SpoutCraftPlayer;
import org.getspout.spoutapi.SpoutManager;
import org.getspout.spoutapi.packet.PacketWorldSeed;
import org.getspout.spoutapi.player.SpoutPlayer;
File
SpoutPlayerListener.java
Developer's decision
None
Kind of conflict
Import