merge fix

ckan · Mar 26, 2012 · ba37da0 · ba37da0
1 parent 2cdc994
commit ba37da0
Showing 1 changed file with 0 additions and 3 deletions.
diff --git a/ckan/lib/helpers.py b/ckan/lib/helpers.py
@@ -550,8 +550,5 @@ def auto_log_message(context):
         return _('Edited settings.')
     return ''
 
-<<<<<<< Updated upstream
 def content_span(body_class):
     return body_class.__str__()
-=======
->>>>>>> Stashed changes