Projects information

Chunk

Conflicting content
allBuildings.put(LR1, (ClayMound)players[0].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection()); allBuildings.put(LR2, (Farmyard)players[0].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection()); allBuildings.put(LR3, (CloisterOffice)players[0].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection()); <<<<<<< HEAD mode.customizeLandscape(players[0].getLandscape()); ======= >>>>>>> 276126473892c006b939520062eb3f3a54bc427a } if(players.length >= 2) { allBuildings.put(LG1, (ClayMound)players[1].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

Conflicting content

			allBuildings.put(LR1, (ClayMound)players[0].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());
			allBuildings.put(LR2, (Farmyard)players[0].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection());
			allBuildings.put(LR3, (CloisterOffice)players[0].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection());
<<<<<<< HEAD
			mode.customizeLandscape(players[0].getLandscape());
=======
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
		}
		if(players.length >= 2) {
			allBuildings.put(LG1, (ClayMound)players[1].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

Solution content
allBuildings.put(LR1, (ClayMound)players[0].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection()); allBuildings.put(LR2, (Farmyard)players[0].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection()); allBuildings.put(LR3, (CloisterOffice)players[0].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection()); mode.customizeLandscape(players[0].getLandscape()); } if(players.length >= 2) { allBuildings.put(LG1, (ClayMound)players[1].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

Solution content

			allBuildings.put(LR1, (ClayMound)players[0].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());
			allBuildings.put(LR2, (Farmyard)players[0].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection());
			allBuildings.put(LR3, (CloisterOffice)players[0].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection());
			mode.customizeLandscape(players[0].getLandscape());
		}
		if(players.length >= 2) {
			allBuildings.put(LG1, (ClayMound)players[1].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

File
Board.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
allBuildings.put(LG1, (ClayMound)players[1].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection()); allBuildings.put(LG2, (Farmyard)players[1].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection()); allBuildings.put(LG3, (CloisterOffice)players[1].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection()); <<<<<<< HEAD mode.customizeLandscape(players[1].getLandscape()); ======= >>>>>>> 276126473892c006b939520062eb3f3a54bc427a } if(players.length >= 3) { allBuildings.put(LB1, (ClayMound)players[2].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

Conflicting content

			allBuildings.put(LG1, (ClayMound)players[1].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());
			allBuildings.put(LG2, (Farmyard)players[1].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection());
			allBuildings.put(LG3, (CloisterOffice)players[1].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection());
<<<<<<< HEAD
			mode.customizeLandscape(players[1].getLandscape());
=======
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
		}
		if(players.length >= 3) {
			allBuildings.put(LB1, (ClayMound)players[2].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

Solution content
allBuildings.put(LG1, (ClayMound)players[1].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection()); allBuildings.put(LG2, (Farmyard)players[1].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection()); allBuildings.put(LG3, (CloisterOffice)players[1].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection()); mode.customizeLandscape(players[1].getLandscape()); } if(players.length >= 3) { allBuildings.put(LB1, (ClayMound)players[2].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

Solution content

			allBuildings.put(LG1, (ClayMound)players[1].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());
			allBuildings.put(LG2, (Farmyard)players[1].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection());
			allBuildings.put(LG3, (CloisterOffice)players[1].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection());
			mode.customizeLandscape(players[1].getLandscape());
		}
		if(players.length >= 3) {
			allBuildings.put(LB1, (ClayMound)players[2].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

File
Board.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
allBuildings.put(LB1, (ClayMound)players[2].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection()); allBuildings.put(LB2, (Farmyard)players[2].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection()); allBuildings.put(LB3, (CloisterOffice)players[2].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection()); <<<<<<< HEAD mode.customizeLandscape(players[2].getLandscape()); ======= >>>>>>> 276126473892c006b939520062eb3f3a54bc427a } if(players.length >= 4) { allBuildings.put(LW1, (ClayMound)players[3].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

Conflicting content

			allBuildings.put(LB1, (ClayMound)players[2].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());
			allBuildings.put(LB2, (Farmyard)players[2].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection());
			allBuildings.put(LB3, (CloisterOffice)players[2].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection());
<<<<<<< HEAD
			mode.customizeLandscape(players[2].getLandscape());
=======
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
		}
		if(players.length >= 4) {
			allBuildings.put(LW1, (ClayMound)players[3].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

Solution content
allBuildings.put(LB1, (ClayMound)players[2].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection()); allBuildings.put(LB2, (Farmyard)players[2].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection()); allBuildings.put(LB3, (CloisterOffice)players[2].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection()); mode.customizeLandscape(players[2].getLandscape()); } if(players.length >= 4) { allBuildings.put(LW1, (ClayMound)players[3].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

Solution content

			allBuildings.put(LB1, (ClayMound)players[2].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());
			allBuildings.put(LB2, (Farmyard)players[2].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection());
			allBuildings.put(LB3, (CloisterOffice)players[2].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection());
			mode.customizeLandscape(players[2].getLandscape());
		}
		if(players.length >= 4) {
			allBuildings.put(LW1, (ClayMound)players[3].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());

File
Board.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
allBuildings.put(LW1, (ClayMound)players[3].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection()); allBuildings.put(LW2, (Farmyard)players[3].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection()); allBuildings.put(LW3, (CloisterOffice)players[3].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection()); <<<<<<< HEAD mode.customizeLandscape(players[3].getLandscape()); ======= >>>>>>> 276126473892c006b939520062eb3f3a54bc427a } }

Conflicting content

			allBuildings.put(LW1, (ClayMound)players[3].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());
			allBuildings.put(LW2, (Farmyard)players[3].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection());
			allBuildings.put(LW3, (CloisterOffice)players[3].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection());
<<<<<<< HEAD
			mode.customizeLandscape(players[3].getLandscape());
=======
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
		}
	}

Solution content
allBuildings.put(LW1, (ClayMound)players[3].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection()); allBuildings.put(LW2, (Farmyard)players[3].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection()); allBuildings.put(LW3, (CloisterOffice)players[3].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection()); mode.customizeLandscape(players[3].getLandscape()); } }

Solution content

			allBuildings.put(LW1, (ClayMound)players[3].getLandscape().getTerrainAt(new Coordinate(4, 0)).getErection());
			allBuildings.put(LW2, (Farmyard)players[3].getLandscape().getTerrainAt(new Coordinate(2, 1)).getErection());
			allBuildings.put(LW3, (CloisterOffice)players[3].getLandscape().getTerrainAt(new Coordinate(4, 1)).getErection());
			mode.customizeLandscape(players[3].getLandscape());
		}
	}

File
Board.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
//2 - push arm getWheel().pushArm(round); <<<<<<< HEAD mode.preRound(); ======= >>>>>>> 276126473892c006b939520062eb3f3a54bc427a //3 - check to see if grapes/stone should become active if(round == grapeActiveOnRound()) getWheel().getGrape().setActive(true);

Conflicting content

		
		//2 - push arm
		getWheel().pushArm(round);
<<<<<<< HEAD
		mode.preRound();
=======
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
		
		//3 - check to see if grapes/stone should become active
		if(round == grapeActiveOnRound()) getWheel().getGrape().setActive(true);

Solution content
//2 - push arm getWheel().pushArm(round); mode.preRound(); //3 - check to see if grapes/stone should become active if(round == grapeActiveOnRound()) getWheel().getGrape().setActive(true);

File
Board.java

Developer's decision
Version 1

Kind of conflict
Method invocation

Chunk

Conflicting content
return this.mode; } <<<<<<< HEAD public void distributeBonusProduction(UsageParam item) { getMode().distributeBonusProduction(item); } public int actionsBeforeSettlement(int player) { ======= public int actionsBeforeSettlement(int player) { >>>>>>> 276126473892c006b939520062eb3f3a54bc427a int currentActivePlayer = getActivePlayer(); int round = getRound();

Conflicting content

		return this.mode;
	}
	
<<<<<<< HEAD
public void distributeBonusProduction(UsageParam item) {
  getMode().distributeBonusProduction(item);
}

public int actionsBeforeSettlement(int player) {
=======
	public int actionsBeforeSettlement(int player) {
		
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
		int currentActivePlayer = getActivePlayer();
		int round = getRound();

Solution content
return this.mode; } public void distributeBonusProduction(UsageParam item) { getMode().distributeBonusProduction(item); } public int actionsBeforeSettlement(int player) { int currentActivePlayer = getActivePlayer(); int round = getRound();

Solution content

		return this.mode;
	}
	
public void distributeBonusProduction(UsageParam item) {
  getMode().distributeBonusProduction(item);
}

public int actionsBeforeSettlement(int player) {
		int currentActivePlayer = getActivePlayer();
		int round = getRound();

File
Board.java

Developer's decision
Version 1

Kind of conflict
Method declaration
Method signature

Chunk

Conflicting content
if (getRound() > getMode().getLastSettlementAfterRound() ) { return -1; } <<<<<<< HEAD ======= >>>>>>> 276126473892c006b939520062eb3f3a54bc427a } for (int i = getMoveInRound(); i <= getMode().getMovesInRound() &&

Conflicting content

			if (getRound() > getMode().getLastSettlementAfterRound() ) {
				return -1;
			}
<<<<<<< HEAD
=======
			
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
		}
		
		for (int i = getMoveInRound(); i <= getMode().getMovesInRound() &&

Solution content
if (getRound() > getMode().getLastSettlementAfterRound() ) { return -1; } } for (int i = getMoveInRound(); i <= getMode().getMovesInRound() &&

File
Board.java

Developer's decision
Version 1

Kind of conflict
Blank

Chunk

Conflicting content
<<<<<<< HEAD abstract public GameCountry getCountry(); abstract public GameLength getLength(); abstract public int getMovesInRound(); abstract public int getLastSettlementAfterRound(); /** * Hook for Short 3/4 Player Short games to remove the first peat and forest tiles / public void customizeLandscape(Landscape landscape) { } abstract protected boolean isProductionBonusActive(); public boolean isSecondLayBrotherUsed() { return true; } /* * Distributes bonus production when the wheel is used for Short 3/4 games */ public void distributeBonusProduction(UsageParam items) { if(isProductionBonusActive()) { for(Player player : board.getPlayers()) { player.addAll(items); } } } ======= abstract public int getMovesInRound(); abstract public int getLastSettlementAfterRound(); >>>>>>> 276126473892c006b939520062eb3f3a54bc427a }

Conflicting content

<<<<<<< HEAD

	abstract public GameCountry getCountry();

	abstract public GameLength getLength();
	abstract public int getMovesInRound();
	
	abstract public int getLastSettlementAfterRound();


	/**
	 * Hook for Short 3/4 Player Short games to remove the first peat and forest tiles
	 */
	public void customizeLandscape(Landscape landscape) {
	}
	
	abstract protected boolean isProductionBonusActive();
	
	public boolean isSecondLayBrotherUsed() {
		return true;
	}
	
	/**
	 * Distributes bonus production when the wheel is used for Short 3/4 games
	 */
	public void distributeBonusProduction(UsageParam items) {
		if(isProductionBonusActive()) {
			for(Player player : board.getPlayers()) {
				player.addAll(items);
			}
		}
	}
=======
	
	abstract public int getMovesInRound();
	
	abstract public int getLastSettlementAfterRound();
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
}

Solution content
return true; } / abstract public GameCountry getCountry(); abstract public GameLength getLength(); abstract public int getMovesInRound(); abstract public int getLastSettlementAfterRound(); abstract public int getMovesInRound(); abstract public int getLastSettlementAfterRound(); / * Hook for Short 3/4 Player Short games to remove the first peat and forest tiles / public void customizeLandscape(Landscape landscape) { } abstract protected boolean isProductionBonusActive(); public boolean isSecondLayBrotherUsed() { Distributes bonus production when the wheel is used for Short 3/4 games */ public void distributeBonusProduction(UsageParam items) { if(isProductionBonusActive()) { for(Player player : board.getPlayers()) { player.addAll(items); } } } }

Solution content

		return true;
	}
	
	/**
	abstract public GameCountry getCountry();

	abstract public GameLength getLength();

	abstract public int getMovesInRound();
	
	abstract public int getLastSettlementAfterRound();
	abstract public int getMovesInRound();
	
	abstract public int getLastSettlementAfterRound();


	/**
	 * Hook for Short 3/4 Player Short games to remove the first peat and forest tiles
	 */
	public void customizeLandscape(Landscape landscape) {
	}
	
	abstract protected boolean isProductionBonusActive();
	
	public boolean isSecondLayBrotherUsed() {
	 * Distributes bonus production when the wheel is used for Short 3/4 games
	 */
	public void distributeBonusProduction(UsageParam items) {
		if(isProductionBonusActive()) {
			for(Player player : board.getPlayers()) {
				player.addAll(items);
			}
		}
	}
}

File
BoardMode.java

Developer's decision
Concatenation

Kind of conflict
Comment
Method declaration
Method interface

Chunk

Conflicting content
@Override public int getMovesInRound() { return 5; <<<<<<< HEAD } ======= } >>>>>>> 276126473892c006b939520062eb3f3a54bc427a public int getLastSettlementAfterRound() { return 25;

Solution content
@Override public int getMovesInRound() { return 5; } public int getLastSettlementAfterRound() { return 25;

File
BoardModeFourLongIreland.java

Developer's decision
Version 1

Kind of conflict
Other

Chunk

Conflicting content

		return 4;
	}
	
<<<<<<< HEAD
	@Override
	public boolean isProductionBonusActive() {
		return false;
	}

	@Override
	public int getMovesInRound() {
		return 4;
	}
	
=======
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
	public int getLastSettlementAfterRound() {
		return 25;
	}

Solution content
@Override public boolean isProductionBonusActive() { return false; } @Override public int getMovesInRound() { return 4; } public int getLastSettlementAfterRound() { return 25; }

File
BoardModeThreeLongIreland.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration

Chunk

Conflicting content
} @Override <<<<<<< HEAD public boolean isProductionBonusActive() { return false; } @Override ======= >>>>>>> 276126473892c006b939520062eb3f3a54bc427a public int getMovesInRound() { return 3; }

Solution content
} @Override public boolean isProductionBonusActive() { return false; } @Override public int getMovesInRound() { return 3; }

File
BoardModeTwoLongFrance.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration

Chunk

Conflicting content

	public GameLength getLength() {
		return LENGTH;
	}
<<<<<<< HEAD
	
	@Override
	public boolean isProductionBonusActive() {
		return false;
	}
	
=======

>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
	@Override
	public int getMovesInRound() {
		return 3;

Solution content
public GameLength getLength() { return LENGTH; } @Override public boolean isProductionBonusActive() { return false; } @Override public int getMovesInRound() { return 3;

File
BoardModeTwoLongIreland.java

Developer's decision
Version 1

Kind of conflict
Annotation
Method declaration

Chunk

Conflicting content

		subtractBeer(param.getBeer());
		subtractReliquary(param.getReliquary());
	}
<<<<<<< HEAD
	public void addAll(UsageParam param) {
		addPeat(param.getPeat());
		addClay(param.getClay());
		addWood(param.getWood());
		addGrain(param.getGrain());
		addSheep(param.getSheep());
		addStone(param.getStone());
		addFlour(param.getFlour());
		addGrapes(param.getGrapes());
		addPenny(param.getPenny());
		addNickel(param.getNickel());
		addHops(param.getHops());
		addCoal(param.getCoal());
		addBooks(param.getBook());
		addPottery(param.getPottery());
		addWhiskey(param.getWhiskey());
		addStraw(param.getStraw());
		addMeat(param.getMeat());
		addOrnament(param.getOrnament());
		addBread(param.getBread());
		addWine(param.getWine());
		addBeer(param.getBeer());
		addReliquary(param.getReliquary());
	}
=======
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
	
	public void placeClergyman(Terrain location) throws WeblaboraException {
		Clergyman dude = null;

Solution content

		subtractBeer(param.getBeer());
		subtractReliquary(param.getReliquary());
	}
	public void addAll(UsageParam param) {
		addPeat(param.getPeat());
		addClay(param.getClay());
		addWood(param.getWood());
		addGrain(param.getGrain());
		addSheep(param.getSheep());
		addStone(param.getStone());
		addFlour(param.getFlour());
		addGrapes(param.getGrapes());
		addPenny(param.getPenny());
		addNickel(param.getNickel());
		addHops(param.getHops());
		addCoal(param.getCoal());
		addBooks(param.getBook());
		addPottery(param.getPottery());
		addWhiskey(param.getWhiskey());
		addStraw(param.getStraw());
		addMeat(param.getMeat());
		addOrnament(param.getOrnament());
		addBread(param.getBread());
		addWine(param.getWine());
		addBeer(param.getBeer());
		addReliquary(param.getReliquary());
	}
	
	public void placeClergyman(Terrain location) throws WeblaboraException {
		Clergyman dude = null;

File
Player.java

Developer's decision
Version 1

Kind of conflict
Method declaration

Chunk

Conflicting content

	public void placeClergyman(Terrain location) throws WeblaboraException {
		Clergyman dude = null;
		if(layBrother1.getLocation() == null) dude = layBrother1;
<<<<<<< HEAD
		else if(layBrother2.getLocation() == null && board.getMode().isSecondLayBrotherUsed()) dude = layBrother2;
=======
		else if(layBrother2.getLocation() == null) dude = layBrother2;
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
		else if(prior.getLocation() == null) dude = prior;
		else
			throw new WeblaboraException("Attempted to place " + color

Solution content

	public void placeClergyman(Terrain location) throws WeblaboraException {
		Clergyman dude = null;
		if(layBrother1.getLocation() == null) dude = layBrother1;
		else if(layBrother2.getLocation() == null && board.getMode().isSecondLayBrotherUsed()) dude = layBrother2;
		else if(prior.getLocation() == null) dude = prior;
		else
			throw new WeblaboraException("Attempted to place " + color

File
Player.java

Developer's decision
Version 1

Kind of conflict
If statement
Variable

Chunk

Conflicting content

		else
			throw new WeblaboraException("Attempted to place " + color
					+ " clergyman when none were free. They are on the "
<<<<<<< HEAD
					+ layBrother1.getLocation().getErection()
					+ (board.getMode().isSecondLayBrotherUsed()?(", the "+layBrother2.getLocation().getErection()):"")
					+ ", and the " + prior.getLocation().getErection() + ".");
=======
					+ layBrother1.getLocation().getErection() + ", the "
					+ layBrother2.getLocation().getErection() + ", and the "
					+ prior.getLocation().getErection() + ".");
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
		
		dude.setLocation(location);
	}

Solution content

		else
			throw new WeblaboraException("Attempted to place " + color
					+ " clergyman when none were free. They are on the "
					+ layBrother1.getLocation().getErection()
					+ (board.getMode().isSecondLayBrotherUsed()?(", the "+layBrother2.getLocation().getErection()):"")
					+ ", and the " + prior.getLocation().getErection() + ".");
		
		dude.setLocation(location);
	}

File
Player.java

Developer's decision
Version 1

Kind of conflict
Method invocation
Throw statement

Chunk

Conflicting content

	
	public boolean isClergymenAllPlaced() {
		return layBrother1.getLocation() != null &&
<<<<<<< HEAD
				(layBrother2.getLocation() != null || board.getMode().isSecondLayBrotherUsed() == false) &&
=======
				layBrother2.getLocation() != null &&
>>>>>>> 276126473892c006b939520062eb3f3a54bc427a
				prior.getLocation() != null;
	}

Solution content

	
	public boolean isClergymenAllPlaced() {
		return layBrother1.getLocation() != null &&
				(layBrother2.getLocation() != null || board.getMode().isSecondLayBrotherUsed() == false) &&
				prior.getLocation() != null;
	}

File
Player.java

Developer's decision
Version 1

Kind of conflict
Attribute
Method invocation

Projects >> weblabora >>263d244568e0b23b7b2184829dab0c463bcce18c