remove cruft from conflict resolution

diff --git a/IkiWiki/Plugin/mailbox.pm b/IkiWiki/Plugin/mailbox.pm
index 14a4a78106ed7409b32cbf89178a03d0fb657a11..84648e402dfe385e9859552aaa4cf53593c2fc78 100644 (file)
--- a/IkiWiki/Plugin/mailbox.pm
+++ b/IkiWiki/Plugin/mailbox.pm
@@ -28,7 +28,6 @@ sub import { #{{{
        hook(type => "preprocess", id => "mailbox", call => \&preprocess);
        hook(type => "scan", id => "mailbox", call => \&scan);
        hook(type => "pagetemplate", id=>"mailbox", call => \&pagetemplate);
-       hook(type => "htmlize",id=>"mbox",call => \&mbox_htmlize);
        IkiWiki::loadplugin("filecheck");
 } # }}}