Projects >> Citizens >>072ac545cc76b1b27d67c4b1041d4e5e931972ee

Chunk
Conflicting content 
	 * 
	 * @return the remaining strength that a healer has
	 */
<<<<<<< HEAD
	public int getStrength() {
		return strength;
=======
	public int getHealth() {
		return health;
>>>>>>> 469387c5cc23490dbac045f3a5c91c6c8b571693
	}

	/**
Solution content 
package com.fullwall.Citizens.NPCTypes.Healers;

import com.fullwall.Citizens.Interfaces.Toggleable;
import com.fullwall.Citizens.Properties.PropertyManager;
import com.fullwall.resources.redecouverte.NPClib.HumanNPC;

public class HealerNPC implements Toggleable {
	private HumanNPC npc;
	private int health = 10;
	private int level = 1;

	/**
	 * Healer NPC object
	 * 
	 * @param npc
	 */
	public HealerNPC(HumanNPC npc) {
		this.npc = npc;
	}
    
	public int getHealth() {
		return health;
	}
File
HealerNPC.java
Developer's decision
Manual
Kind of conflict
Attribute
Method signature
Return statement
Chunk
Conflicting content 
	 * @param strength
	 *            the remaining strength of a healer
	 */
<<<<<<< HEAD
	public void setStrength(int strength) {
		this.strength = strength;
=======
	public void setHealth(int health) {
		this.health = health;
	}

	/**
	 * Get the maximum health of a healer NPC
	 * 
	 * @return
	 */
	public int getMaxHealth() {
		return level * 10;
	}

	/**
	 * Get the level of a healer NPC
	 * 
	 * @return
	 */
	public int getLevel() {
		return level;
	}

	/**
	 * Set the level of a healer NPC
	 * 
	 * @param level
	 */
	public void setLevel(int level) {
		this.level = level;
>>>>>>> 469387c5cc23490dbac045f3a5c91c6c8b571693
	}

	@Override
Solution content 
	public void setHealth(int health) {
		this.health = health;
	}

	/**
	 * Get the maximum health of a healer NPC
	 * 
	 * @return
	 */
	public int getMaxHealth() {
		return level * 10;
	}

	/**
	 * Get the level of a healer NPC
	 * 
	 * @return
	 */
	public int getLevel() {
		return level;
	}

	/**
	 * Set the level of a healer NPC
	 * 
	 * @param level
	 */
	public void setLevel(int level) {
		this.level = level;
	}

	@Override
File
HealerNPC.java
Developer's decision
Version 2
Kind of conflict
Attribute
Comment
Method declaration
Method signature