From cd1cd96eb030f7423847c161ca24d3b42f05f982 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 20 Mar 2014 12:09:09 -0400 Subject: fix up old comments that used format=txt, which is no longer enabled --- .../comment_1_307898855f91a2a189d4fa5eae62cce1._comment | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment') 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" -- cgit v1.2.3