update on some of the conflict cases

[git.ikiwiki.info.git] / doc / todo / mbox.mdwn

diff --git a/doc/todo/mbox.mdwn b/doc/todo/mbox.mdwn
index 4753ddaf2c526f39efde97eaed1719b9d026bb31..bae9ea3e846138b2737a1acc02c3337fd41ee1e2 100644 (file)
--- a/doc/todo/mbox.mdwn
+++ b/doc/todo/mbox.mdwn
@@ -2,3 +2,5 @@ I'd like to be able to drop an unmodified RFC2822 email message into ikiwiki, an
 
 > We're discussing doing just that (well, whole mailboxes, really) over in
 > [[comment_by_mail]] --[[Joey]]
+
+>> I am going to start putting something simple together. [[DavidBremner]]