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