justquick/django-activity-stream — Issue #60: Bad merge in activity_tags.py
Author: crass
Created: 2012-01-19 20:41:50+00:00
State: open

Importing activity_tags.py generates a syntax error because of an improperly resolved merge. Search for "<<<<<< HEAD". This issue was created in commit 5f85920e09bd874aab56b0fb1b8823d96cd73c4a, the merge from lincoln-loop.