From 97524f1e02ac5156db15ac483639015c723d72b0 Mon Sep 17 00:00:00 2001
From: Shank <nicatron21@gmail.com>
Date: Mon, 30 May 2011 15:59:42 -0600
Subject: [PATCH] Fixed conflict

---
 TShockAPI/TShock.cs | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/TShockAPI/TShock.cs b/TShockAPI/TShock.cs
index 6c3c10fc..ff2ce9f1 100644
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@@ -124,13 +124,9 @@ namespace TShockAPI
         void OnChat(int ply, string msg, HandledEventArgs handler)
         {
             if (Main.netMode != 2) { return; }
-<<<<<<< HEAD
             int x = (int) Main.player[ply].position.X;
             int y = (int) Main.player[ply].position.Y;
-=======
-            int x = (int)Main.player[ply].position.X;
-            int y = (int)Main.player[ply].position.Y;
->>>>>>> a4cf86f85300a81a3eab772d8735dcd7c6747010
+
             if (IsAdmin(ply))
             {
                 if (msg.Length > 5 && msg.Substring(0, 5) == "/kick")