Projects >> Citizens >>bbef0a3db00facf546639f4c1a6692c4e3a567b6

Chunk
Conflicting content
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

<<<<<<< HEAD
import net.citizensnpcs.utils.MessageUtils;
import net.citizensnpcs.utils.Messaging;
import net.citizensnpcs.utils.PageUtils;
import net.citizensnpcs.utils.PageUtils.PageInstance;
import net.citizensnpcs.utils.StringUtils;

=======
>>>>>>> cd31e9c80fe7c177852f5472befd94d0d79e3566
public class AlchemistManager {

	private static HashMap hasClickedOnce = new HashMap();
Solution content
import org.bukkit.entity.Player;
import org.bukkit.inventory.ItemStack;

import net.citizensnpcs.utils.PageUtils;
import net.citizensnpcs.utils.PageUtils.PageInstance;

public class AlchemistManager {

	private static HashMap hasClickedOnce = new HashMap();
File
AlchemistManager.java
Developer's decision
Combination
Kind of conflict
Import