From 0a0d66eebfbf811529fe4b8ba9d5ced18c28b642 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Wed, 15 Aug 2018 09:58:01 +0200 Subject: [PATCH] Fix for the two last revert commits. --- .../bentobox/managers/island/IslandGrid.java | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java b/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java index a22312211..25a34ae58 100644 --- a/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java +++ b/src/main/java/world/bentobox/bentobox/managers/island/IslandGrid.java @@ -1,21 +1,8 @@ package world.bentobox.bentobox.managers.island; -<<<<<<< HEAD -<<<<<<< HEAD -import org.apache.commons.lang.Validate; - -import com.google.common.collect.Table; -import com.google.common.collect.TreeBasedTable; - -======= -import com.google.common.collect.Table; -import com.google.common.collect.TreeBasedTable; ->>>>>>> parent of bfff61e... Rewrote IslandGrid.Cell -======= import java.util.Map.Entry; import java.util.TreeMap; ->>>>>>> parent of b54c7ad... Rewrote IslandGrid to use Table<> from Guava import world.bentobox.bentobox.database.objects.Island; /**