Projects >> TDA367 >>d2a525738eff35f2897aa25eedf924802b0ea569

Chunk
Conflicting content 
import cha.domain.Tile;

public class TestMission {
<<<<<<< HEAD
=======
	private static final Team Team = null;

	@Test
	public void testMission() {
		Piece p = new Piece(Team);
		Bet b = new Bet(4);
		Board bd = new Board();
		Mission m = new Mission(p);
		m.startMission( Category.BODYTOBODY, b);
	}
>>>>>>> 68a357fe64aa0a1fdc56a10eb0853a5ced3fe321
	
}
Solution content 
import cha.domain.Tile;

public class TestMission {
<<<<<<< HEAD
=======
	private static final Team Team = null;

	@Test
	public void testMission() {
		Piece p = new Piece(Team);
		Bet b = new Bet(4);
		Board bd = new Board();
		Mission m = new Mission(p);
		m.startMission( Category.BODYTOBODY, b);
	}
>>>>>>> 68a357fe64aa0a1fdc56a10eb0853a5ced3fe321
	
}
File
TestMission.java
Developer's decision
Manual
Kind of conflict
Annotation
Attribute
Method declaration
Chunk
Conflicting content 
	
	// Constructors
	
<<<<<<< HEAD
	//private Board(){
		

	private Board(){
		Random randomTiles = new Random();
	//}
//		this.colorList = new ArrayList();
//		this.tileList = new ArrayList();
//		
//		this.colorList.add(Color.BLUE);
//		this.colorList.add(Color.RED);
//		this.colorList.add(Color.YELLOW);
//		this.colorList.add(Color.GREEN);
=======
	public Board(){

		this.tileList = new ArrayList();

>>>>>>> 68a357fe64aa0a1fdc56a10eb0853a5ced3fe321
		
		Random rand = new Random();
		for(int i=0; i<48; i++){
Solution content 
	
	// Constructors

	//private Board(){
		

	private Board(){
		Random randomTiles = new Random();
	//}
//		this.colorList = new ArrayList();
//		this.tileList = new ArrayList();
//		
//		this.colorList.add(Color.BLUE);
//		this.colorList.add(Color.RED);
//		this.colorList.add(Color.YELLOW);
//		this.colorList.add(Color.GREEN);

	public Board(){

		this.tileList = new ArrayList();

		
		Random rand = new Random();
		for(int i=0; i<48; i++){
File
Board.java
Developer's decision
Concatenation
Kind of conflict
Attribute
Comment
Method invocation
Method signature
Variable