Projects >> CraftBook >>86861737fd4f8ce3609bfae5f732e020cf0bd94a

Chunk
Conflicting content 
import org.bukkit.Server;
import org.bukkit.block.Sign;

<<<<<<< HEAD
public class Clock extends AbstractIC {
=======
import com.sk89q.craftbook.ic.AbstractIC;
import com.sk89q.craftbook.ic.AbstractICFactory;
import com.sk89q.craftbook.ic.ChipState;
import com.sk89q.craftbook.ic.IC;
import com.sk89q.craftbook.ic.ICVerificationException;
import com.sk89q.craftbook.ic.SelfTriggeredIC;

public class Clock extends AbstractIC implements SelfTriggeredIC {
>>>>>>> 68c0a6b4686912e23f24b4a04aab56c60fc5c809

    final Sign sign;
Solution content 
import org.bukkit.Server;
import org.bukkit.block.Sign;

public class Clock extends AbstractIC {

    final Sign sign;
File
Clock.java
Developer's decision
Version 1
Kind of conflict
Class signature
Import