diff options
| author |  Joey Hess <joey@kitenet.net> | 2014-03-20 12:09:09 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-03-20 12:09:09 -0400 |
| commit | cd1cd96eb030f7423847c161ca24d3b42f05f982 (patch) | |
| tree | b4f0ae6d0b3755b0ae1b2d5c318da75d8b2bd63f /doc/automatic_conflict_resolution | |
| parent | 68761ce4846acfc25ac30539736f81aa70c90085 (diff) | |
fix up old comments that used format=txt, which is no longer enabled
Diffstat (limited to 'doc/automatic_conflict_resolution')
| -rw-r--r-- | doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment b/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment index 69e136b44..57a8c45f8 100644 --- a/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment +++ b/doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment @@ -1,4 +1,4 @@ -[[!comment format=txt +[[!comment format=mdwn username="https://www.google.com/accounts/o8/id?id=AItOawnJTqmRu1YCKS2Hsm4vtOflLhP4fU-k98w" nickname="Ahmed" subject="Customise conflict resolution behaviour" |