Permalink
Browse files

Fix conflict error

  • Loading branch information...
2 parents c21d7ea + 83f4efb commit 266221a58b36765bd1dc4490a187f3393819b74a @patrick91 patrick91 committed Aug 19, 2012
Showing with 1 addition and 2 deletions.
  1. +1 −2 quotes/quotes/views.py
View
@@ -92,7 +92,6 @@ def addstar(request):
try:
UserStar.objects.create(user=request.user, quote=quote)
except: # IntegrityError
- raise
- #return HttpResponse("0", content_type='application/json')
+ return HttpResponse("0", content_type='application/json')
else:
return HttpResponse("1", content_type='application/json')

0 comments on commit 266221a

Please sign in to comment.