Mikaela
/
Limnoria
mirror of https://github.com/Mikaela/Limnoria.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix previous merge.

This commit is contained in:
Valentin Lorentz 2014-04-05 22:56:40 +02:00
parent 8885a813c5
commit d89e4b5635
2 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -23,3 +23,4 @@ supybot.egg-info/
test-conf/
test-data/
test-logs/
src/version.py

1
src/commands.py
View File

@ -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: