From dbd0b4f4fecf3e5359db81c3cd624ede3ce78b95 Mon Sep 17 00:00:00 2001
From: Chaoscaot <max.spaeth01@gmail.com>
Date: Mon, 16 Nov 2020 21:38:51 +0100
Subject: [PATCH] Fixing Merge Conflicts

---
 SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java | 2 --
 1 file changed, 2 deletions(-)

diff --git a/SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java b/SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java
index 70bc593..2ebbb79 100644
--- a/SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java
+++ b/SpigotCore_Main/src/de/steamwar/comms/BungeeReceiver.java
@@ -30,8 +30,6 @@ import de.steamwar.core.Core;
 import de.steamwar.sql.SteamwarUser;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.Sound;
-import org.bukkit.SoundCategory;
 import org.bukkit.entity.Player;
 import org.bukkit.event.inventory.ClickType;
 import org.bukkit.plugin.messaging.PluginMessageListener;