Projects >> ardublock >>3bd622ff6e8950f9214298e576deaf59366b157b

Chunk
Conflicting content
{
	private List setupCommand;
	
<<<<<<< HEAD:src/main/java/com/ardublock/translator/block/ProgramBlock.java
	public ProgramBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
=======
	public Loop2Block(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
>>>>>>> 745dc42ebb4954fe9c8ca8cb8ecb78d406c1a5b1:src/main/java/com/ardublock/translator/block/Loop2Block.java
	{
		super(blockId, translator);
		setupCommand = new LinkedList();
Solution content
{
	private List setupCommand;
	
	public ProgramBlock(Long blockId, Translator translator, String codePrefix, String codeSuffix, String label)
	{
		super(blockId, translator);
		setupCommand = new LinkedList();
File
ProgramBlock.java
Developer's decision
Version 1
Kind of conflict
Method signature