Merge jQuery branch, resolve conflicts

[mediagoblin.git] / mediagoblin / submit / routing.py

diff --git a/mediagoblin/submit/routing.py b/mediagoblin/submit/routing.py
index 3edbab707126304fcb611191eb6a16b68629d1c1..03e01f45128aba1287dc54b5f0a380c726fe5ef7 100644 (file)
--- a/mediagoblin/submit/routing.py
+++ b/mediagoblin/submit/routing.py
@@ -1,5 +1,5 @@
 # GNU MediaGoblin -- federated, autonomous media hosting
-# Copyright (C) 2011 Free Software Foundation, Inc
+# Copyright (C) 2011 MediaGoblin contributors.  See AUTHORS.
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as published by
@@ -18,7 +18,4 @@ from routes.route import Route
 
 submit_routes = [
     Route('mediagoblin.submit.start', '/',
-          controller='mediagoblin.submit.views:submit_start'),
-    Route('mediagoblin.submit.success', '/success/',
-          template='mediagoblin/submit/success.html',
-          controller='mediagoblin.views:simple_template_render')]
+          controller='mediagoblin.submit.views:submit_start')]