Added a comment

This commit is contained in:
http://johan.kiviniemi.name/ 2014-04-07 22:48:19 +00:00 committed by admin
parent c888c5f46d
commit 1b5c6bac73

View file

@ -0,0 +1,8 @@
[[!comment format=mdwn
username="http://johan.kiviniemi.name/"
nickname="Johan"
subject="comment 8"
date="2014-04-07T22:48:18Z"
content="""
There are no commits in `master` or `git-annex` that have the word conflict in the description.
"""]]