X-Git-Url: http://git.tremily.us/?a=blobdiff_plain;f=doc%2Ftodo%2Fconflict_free_comment_merges.mdwn;h=e84400c172a3a8635bd7e33178b81c3b750aff06;hb=HEAD;hp=2cef0ee8cd3285f687c52f46b615d3e5aa07157b;hpb=6af6c89df314cf2f9c9e053c04aa2bd492072ab1;p=ikiwiki.git diff --git a/doc/todo/conflict_free_comment_merges.mdwn b/doc/todo/conflict_free_comment_merges.mdwn index 2cef0ee8c..e84400c17 100644 --- a/doc/todo/conflict_free_comment_merges.mdwn +++ b/doc/todo/conflict_free_comment_merges.mdwn @@ -20,4 +20,4 @@ What do you think [[smcv]]? --[[Joey]] > are quite low since it modifies the input text and adds a date stamp to > it. > -> Anyway, I think it's good, [[[done]] --[[Joey]] +> Anyway, I think it's good, [[done]] --[[Joey]]