From: David Bremner <bremner@unb.ca>
Date: Mon, 1 Sep 2008 13:55:42 +0000 (-0300)
Subject: remove cruft from conflict resolution
X-Git-Tag: 0.4~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=93626e78f6fa1459c5d23db805ed2a9d1095e2ab;p=ikiwiki.git

remove cruft from conflict resolution
---

diff --git a/IkiWiki/Plugin/mailbox.pm b/IkiWiki/Plugin/mailbox.pm
index 14a4a7810..84648e402 100644
--- 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");
 } # }}}