Projects >> AdminCmd >>02814e9112dd9f905906c8bfc477a241ea6207ce

Chunk
Conflicting content 
		}
		if (found) {
			pFrom.teleport(pTo);
<<<<<<< HEAD
			player.sendMessage("Succefully teleported " + ChatColor.BLUE + pFrom.getName() + ChatColor.WHITE
					+ " to " + ChatColor.GREEN + pTo.getName());
=======
			player.sendMessage("Successfully teleported " + ChatColor.BLUE
					+ pFrom.getName() + ChatColor.WHITE + " to "
					+ ChatColor.GREEN + pTo.getName());
>>>>>>> c9feff48d074a53f0ebe22ec8b66b21b97d98b80
		}
		return true;
	}
Solution content 
		}
		if (found) {
			pFrom.teleport(pTo);
			player.sendMessage("Successfully teleported " + ChatColor.BLUE
					+ pFrom.getName() + ChatColor.WHITE + " to "
					+ ChatColor.GREEN + pTo.getName());
		}
		return true;
	}
File
AdminCmdWorker.java
Developer's decision
Version 2
Kind of conflict
Method invocation
Chunk
Conflicting content 
		} else
			player.sendMessage("You can't repair this item : " + ChatColor.RED + item.getType());

<<<<<<< HEAD
		return true;
	}

	public boolean repairAll() {
		for (ItemStack item : player.getInventory().getContents())
			if (item != null && listOfPossibleRepair.contains(item.getTypeId()))
				item.setDurability((short) 0);
=======
		}
		if (i == listOfPossibleRepair.size())
			player.sendMessage("You can't repair this item : " + ChatColor.RED
					+ item.getType());
		else if (item.getDurability() == (short) 0)
			player.sendMessage("Your item " + ChatColor.RED + item.getType()
					+ ChatColor.WHITE + " have been successfully repaired.");
>>>>>>> c9feff48d074a53f0ebe22ec8b66b21b97d98b80

		player.sendMessage("All your items have been repaired.");
		return true;
Solution content 
		} else
			player.sendMessage("You can't repair this item : " + ChatColor.RED + item.getType());

		return true;
		}
	}


	public boolean repairAll() {
		for (ItemStack item : player.getInventory().getContents())
			if (item != null && listOfPossibleRepair.contains(item.getTypeId()))
				item.setDurability((short) 0);

		player.sendMessage("All your items have been repaired.");
		return true;
File
AdminCmdWorker.java
Developer's decision
Combination
Kind of conflict
For statement
If statement
Method signature
Return statement