From 99fe1b3624bc79d29027cfaddc915008eb31363d Mon Sep 17 00:00:00 2001
From: Chris Rhodes <iopred@gmail.com>
Date: Sun, 17 Feb 2013 19:09:10 -0800
Subject: [PATCH] Fix Readme

---
 README.md | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/README.md b/README.md
index dcf682b..89d1115 100644
--- a/README.md
+++ b/README.md
@@ -28,19 +28,11 @@ Synopsis:
 
 		// Add handlers to do things here!
 		// e.g. join a channel on connect.
-<<<<<<< HEAD
 		c.HandleFunc(irc.CONNECTED,
 			func(conn *irc.Conn, line *irc.Line) { conn.Join("#channel") })
 		// And a signal on disconnect
 		quit := make(chan bool)
 		c.HandleFunc(irc.DISCONNECTED,
-=======
-		c.HandleFunc("connected",
-			func(conn *irc.Conn, line *irc.Line) { conn.Join("#channel") })
-		// And a signal on disconnect
-		quit := make(chan bool)
-		c.HandleFunc("disconnected",
->>>>>>> fluffle/master
 			func(conn *irc.Conn, line *irc.Line) { quit <- true })
 
 		// Tell client to connect.