continue with merge

2019-04-03 22:28:57 +11:00
parent 8aef06b29e
commit 7086eb8b3e
20 changed files with 136 additions and 115 deletions
--- a/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java
+++ b/worldedit-bukkit/src/main/java/com/sk89q/worldedit/bukkit/BukkitBiomeRegistry.java
@@ -40,5 +40,4 @@ class BukkitBiomeRegistry implements BiomeRegistry {
        final Biome bukkitBiome = BukkitAdapter.adapt(biome);
        return bukkitBiome == null ? null : bukkitBiome::name;
    }
-
 }