Fail auto-merge, fixed.

2011-06-05 13:21:10 +08:00 · 2011-06-05 13:21:10 +08:00 · 8d375506b4
commit 8d375506b4
parent 59e73e996c
1 changed files with 0 additions and 3 deletions
--- a/TShockAPI/TShock.cs
+++ b/TShockAPI/TShock.cs
@ -377,11 +377,8 @@ namespace TShockAPI
                            }
                        }
                }
-<<<<<<< HEAD
                else if (e.MsgID == 0x22) // Client only KillTile
                    e.Handled = true; // Client only uses it for chests, but sends regular 17 as well.
-=======
->>>>>>> master
            }
            catch (Exception ex)
            {