1
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 03:35:51 +00:00

Removed unintended code

This commit is contained in:
VoidAngel 2018-04-25 10:45:54 -07:00
parent 2506437339
commit 5f8328c02c

View File

@ -23,10 +23,5 @@ public class Variables {
public static List<UUID> blocks = new ArrayList<UUID>();
public static List<UUID> cancelPlace = new ArrayList<UUID>();
public static Map<UUID, ItemStack> arrows = new HashMap<UUID, ItemStack>();
<<<<<<< HEAD
public static Map<UUID, String> dialogueCooldown = new HashMap<UUID, String>();
=======
public static List<UUID> usingGuide = new ArrayList<UUID>();
>>>>>>> parent of f595cb0... Fix for players getting stuck in elevator books/teleporter guis
}