diff options
Diffstat (limited to 'doc/automatic_conflict_resolution/comment_1_307898855f91a2a189d4fa5eae62cce1._comment')
| -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" |