Solved conflicts in repo

misago/urls.py

@@ -12,7 +12,7 @@ urlpatterns = patterns('misago.apps',
 
 # Remove after ACP was refactored
 urlpatterns += patterns('',
-    url(r'^users/(?P<username>\w+)-(?P<user>\d+)/$', 'misago.apps.admin.index.todo', name="user"),    
+    url(r'^users/(?P<username>\w+)-(?P<user>\d+)/$', 'misago.apps.admin.index.todo', name="user"),
 )
 
 """

misago/utils/views.py

@@ -5,9 +5,6 @@ from django.shortcuts import redirect
 from django.template import RequestContext
 
 def redirect_message(request, message, type='info', owner=None):
-    """
-    Set flash message and redirect to board index.
-    """
     request.messages.set_flash(message, type, owner)
     return redirect(reverse('index'))
 
@@ -21,4 +18,4 @@ def ajax_response(request, template=None, macro=None, vars={}, json={}, status=2
                                        'message': message,
                                        'html': html
                                        }.items()), sort_keys=True,  ensure_ascii=False)
-    return HttpResponse(response, content_type='application/json', status=status)
+    return HttpResponse(response, content_type='application/json', status=status)