summaryrefslogtreecommitdiff
path: root/doc/todo/conflict_free_comment_merges.mdwn
diff options
context:
space:
mode:
Diffstat (limited to 'doc/todo/conflict_free_comment_merges.mdwn')
-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]]