From 70c8ef548fcf63fac0d9f1c51ad753ab3ba605c0 Mon Sep 17 00:00:00 2001
From: Lucas Nicodemus <shank@shanked.me>
Date: Wed, 27 Dec 2017 19:09:08 -0700
Subject: [PATCH] Fix merge conflict part 2

---
 TShockAPI/Rest/RestManager.cs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/TShockAPI/Rest/RestManager.cs b/TShockAPI/Rest/RestManager.cs
index de34395e..d47130b6 100644
--- a/TShockAPI/Rest/RestManager.cs
+++ b/TShockAPI/Rest/RestManager.cs
@@ -1003,7 +1003,6 @@ namespace TShockAPI
 			var reason = null == args.Parameters["reason"] ? "Banned via web" : args.Parameters["reason"];
 			TShock.Bans.AddBan(player.IP, player.Name, "", "", reason);
 			player.Kick(reason, true, false, null, true);
-			TShock.Utils.ForceKick(player, reason, false, true);
 			return RestResponse("Player " + player.Name + " was banned");
 		}