Projects >> craftStats >>f3b4ba91aca042b8df5617b8cca9af9ff0c3ce7f

Chunk
Conflicting content 
		pm.registerEvent(Event.Type.PLAYER_INTERACT, playerListener, Event.Priority.Monitor, this);
		pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, playerListener, Event.Priority.Monitor, this);
		pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Event.Priority.Monitor, this);
<<<<<<< HEAD
=======
		
		getCommand("dmg").setExecutor(commandExec);
		

>>>>>>> 6428e741c5cad47536da90adf7f552a9e75d54a1
		
		getCommand("dmg").setExecutor(commandExec);		
	}
Solution content 
		pm.registerEvent(Event.Type.PLAYER_INTERACT, playerListener, Event.Priority.Monitor, this);
		pm.registerEvent(Event.Type.PLAYER_DROP_ITEM, playerListener, Event.Priority.Monitor, this);
		pm.registerEvent(Event.Type.ENTITY_DAMAGE, entityListener, Event.Priority.Monitor, this);

		getCommand("dmg").setExecutor(commandExec);
	}
File
craftStats.java
Developer's decision
Version 1
Kind of conflict
Method invocation