From cc01deb4bb29df2961418a5bbfd66f6a956b3274 Mon Sep 17 00:00:00 2001
From: Andrey Petrov <andrey.petrov@shazow.net>
Date: Sat, 13 Dec 2014 13:47:28 -0800
Subject: [PATCH] OOops merge conflict.

---
 client.go | 1 -
 1 file changed, 1 deletion(-)

diff --git a/client.go b/client.go
index 69015cc..27cba79 100644
--- a/client.go
+++ b/client.go
@@ -25,7 +25,6 @@ const HELP_TEXT string = SYSTEM_MESSAGE_FORMAT + `-> Available commands:
 ` + RESET
 
 const OP_HELP_TEXT string = SYSTEM_MESSAGE_FORMAT + `-> Available operator commands:
-<<<<<<< HEAD
    /ban $NAME       - Banish a user from the chat
    /kick $NAME      - Kick em' out.
    /op $NAME        - Promote a user to server operator