justquick/django-activity-stream — comment on commit 5f85920e09bd874aab56b0fb1b8823d96cd73c4a
File:  line 0
By lukeman:

Looks like some diffs from a merge conflict got checked in. See activity_tags.py.