diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2010-02-19 13:31:37 -0500 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2010-02-19 13:31:37 -0500 |
| commit | 75baac425b6640ccff9f6d4b3340e07aff972b3d (patch) | |
| tree | ccc38628b3c745a52c7cc2cd0b6a7f0c9a7da6b0 /doc/todo/conflict_free_comment_merges.mdwn | |
| parent | 21997387d40326e623cddb10a93dcb208025b77a (diff) | |
| parent | 59017c6ae19f661761d0ae3f143fbda643ca1e8d (diff) | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
Diffstat (limited to 'doc/todo/conflict_free_comment_merges.mdwn')
| -rw-r--r-- | doc/todo/conflict_free_comment_merges.mdwn | 2 |
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]] |