summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorhttp://jmtd.livejournal.com/ <http://jmtd.livejournal.com/@web>2010-02-19 14:00:52 +0000
committerJoey Hess <joey@finch.kitenet.net>2010-02-19 14:00:52 +0000
commitd1137697a80ca5e90bfc9d1c1f00b455871b99c5 (patch)
tree4a2bfc1b36d5d38c653718b615546652dbbd3ba6 /doc
parent598fdfd1aa1180e296af42f5b15f6b3add716be7 (diff)
fix 'done' link
Diffstat (limited to 'doc')
-rw-r--r--doc/todo/conflict_free_comment_merges.mdwn2
1 files changed, 1 insertions, 1 deletions
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]]