Projects >> TDA367 >>2aa4988c75eb77b63030c8c52370dcd1e1597c38

Chunk
Conflicting content 
		/*if (availableColorsNextRound.isEmpty()){
			for (Color color : availableColors)
				availableColorsNextRound.add(color);
<<<<<<< HEAD
		}
		
=======
		}*/
>>>>>>> 57171cbf648a1dc5aac5ac3659b3c86495e3629a
	}
	
	public void movePieceForward(int bet){
Solution content 
		/*if (availableColorsNextRound.isEmpty()){
			for (Color color : availableColors)
				availableColorsNextRound.add(color);
		}*/
	}
	
	public void movePieceForward(int bet){
File
Piece.java
Developer's decision
Version 2
Kind of conflict
Other