Projects >> CombatEventsCore >>fd913c0cea375c4b72184b999e7a1e251db5f52c

Chunk
Conflicting content
	/**
	 * This event can only be cancelled if a player leaves combat
	 * because the timer expired, or because the event was generated through another plugin.
<<<<<<< HEAD
	 * 
	 * 
=======
	 * 
	 * 
>>>>>>> 636c9ff1043f593c0f383c2de90db0c73ac5c6bd
	 * @param boolean cancel
	 */
	public void setCancelled(boolean cancel) {
Solution content
	/**
	 * This event can only be cancelled if a player leaves combat
	 * because the timer expired, or because the event was generated through another plugin.
	 * 
	 * 
	 * @param boolean cancel
	 */
	public void setCancelled(boolean cancel) {
File
PlayerLeaveCombatEvent.java
Developer's decision
Version 1
Kind of conflict
Comment