From 3c42a1f513f5efeb98d48829abac40b4c198e97b Mon Sep 17 00:00:00 2001
From: Valentin Lorentz <progval@gmail.com>
Date: Sat, 26 Feb 2011 10:44:35 +0100
Subject: [PATCH] Plugin: fix forgotten merge info

---
 plugins/Plugin/plugin.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/plugins/Plugin/plugin.py b/plugins/Plugin/plugin.py
index 105a0125f..6bb7ac73d 100644
--- a/plugins/Plugin/plugin.py
+++ b/plugins/Plugin/plugin.py
@@ -130,7 +130,6 @@ class Plugin(callbacks.Plugin):
             irc.error(format('There is no command %q.', command))
     plugins = wrap(plugins, [many('something')])
 
->>>>>>> 3005752... fix docstring for Plugin.plugin command so it actually says what the command will do.
     def author(self, irc, msg, args, cb):
         """<plugin>