From 93626e78f6fa1459c5d23db805ed2a9d1095e2ab Mon Sep 17 00:00:00 2001
From: David Bremner <bremner@unb.ca>
Date: Mon, 1 Sep 2008 10:55:42 -0300
Subject: [PATCH] remove cruft from conflict resolution

---
 IkiWiki/Plugin/mailbox.pm | 1 -
 1 file changed, 1 deletion(-)

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");
 } # }}}
 
-- 
2.26.2