From 657b76d17488ea89bf71632df43a8f6e35191afd Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@gmail.com>
Date: Sun, 22 Sep 2013 20:29:52 +0200
Subject: [PATCH] Fix merge.

---
 src/ircdb.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/ircdb.py b/src/ircdb.py
index 3a9cd33c2..76fec3c6d 100644
--- a/src/ircdb.py
+++ b/src/ircdb.py
@@ -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