Commits

Sasha Vincic committed f7f502d

missed conflict marker

  • Participants
  • Parent commits 8cf8595

Comments (0)

Files changed (1)

File lfs/manage/views/property_groups/products.py

         "message": _(u"Products have been removed.")
     }, cls=LazyEncoder)
 
-    return HttpResponse(result, content_type='application/json; charset=utf8')>>>>>>> other
+    return HttpResponse(result, content_type='application/json; charset=utf8')