fix merge conflict

This commit is contained in:
Kevin Ramharak 2019-01-14 18:46:23 +01:00
parent c5a34c7a3f
commit 78a9f78a54

View File

@ -7,7 +7,7 @@ import net.simon987.server.assembly.Util;
public class IncInstruction extends Instruction {
public static final int OPCODE = 43;
public static final int OPCODE = 42;
public IncInstruction() {
super("inc", OPCODE);