From d89e4b5635b4bad52a4f75050577d57d96993dc7 Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@gmail.com>
Date: Sat, 5 Apr 2014 22:56:40 +0200
Subject: [PATCH] Fix previous merge.

---
 .gitignore      | 1 +
 src/commands.py | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 17dd40d60..9cc03ecd6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -23,3 +23,4 @@ supybot.egg-info/
 test-conf/
 test-data/
 test-logs/
+src/version.py
diff --git a/src/commands.py b/src/commands.py
index a2282b850..793023843 100644
--- a/src/commands.py
+++ b/src/commands.py
@@ -335,7 +335,6 @@ def getNetworkIrc(irc, msg, args, state, errorIfNoMatch=False):
     else:
         state.args.append(irc)
 
-<<<<<<< HEAD
 def getHaveVoice(irc, msg, args, state, action=_('do that')):
     getChannel(irc, msg, args, state)
     if state.channel not in irc.state.channels: