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

Fix merge.

This commit is contained in:
Valentin Lorentz 2013-09-22 20:29:52 +02:00
parent 990b911c06
commit 657b76d174
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/ircdb.py
View File

@ -2,7 +2,6 @@
# Copyright (c) 2002-2009, Jeremiah Fincher
# Copyright (c) 2011, Valentin Lorentz
# Copyright (c) 2009,2013, James McCoy
>>>>>>> supybot/master
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without