From f17b48fff304d1327462fe7b403ca1a6a9c64a25 Mon Sep 17 00:00:00 2001
From: Chris Dodge <cdodge@edx.org>
Date: Mon, 1 Oct 2012 15:19:05 -0400
Subject: [PATCH] fix problem introduced when rebasing master and manually
 resolving conflicts

---
 cms/urls.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cms/urls.py b/cms/urls.py
index 141abac2ac..bf391eb8e9 100644
--- a/cms/urls.py
+++ b/cms/urls.py
@@ -19,7 +19,7 @@ urlpatterns = ('',
     url(r'^preview/modx/(?P<preview_id>[^/]*)/(?P<location>.*?)/(?P<dispatch>[^/]*)$',
         'contentstore.views.preview_dispatch', name='preview_dispatch'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<coursename>[^/]+)/upload_asset$', 
-        'contentstore.views.upload_asset', name='upload_asset')
+        'contentstore.views.upload_asset', name='upload_asset'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)/manage_users$',
         'contentstore.views.manage_users', name='manage_users'),
     url(r'^(?P<org>[^/]+)/(?P<course>[^/]+)/course/(?P<name>[^/]+)/add_user$',