From b2e4952f0240c657f628f11489c70c5240f4adb9 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Fri, 13 Jan 2006 03:42:26 +0000 Subject: [PATCH] magic-removal: Moved django/contrib/admin/urls/admin.py to django/contrib/admin/urls.py, to cut down on code length. git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1935 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/conf/project_template/urls.py | 2 +- django/contrib/admin/{urls/admin.py => urls.py} | 0 django/contrib/admin/urls/__init__.py | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename django/contrib/admin/{urls/admin.py => urls.py} (100%) delete mode 100644 django/contrib/admin/urls/__init__.py diff --git a/django/conf/project_template/urls.py b/django/conf/project_template/urls.py index fe77ea1867..4483014173 100644 --- a/django/conf/project_template/urls.py +++ b/django/conf/project_template/urls.py @@ -5,5 +5,5 @@ urlpatterns = patterns('', # (r'^{{ project_name }}/', include('{{ project_name }}.apps.foo.urls.foo')), # Uncomment this for admin: -# (r'^admin/', include('django.contrib.admin.urls.admin')), +# (r'^admin/', include('django.contrib.admin.urls')), ) diff --git a/django/contrib/admin/urls/admin.py b/django/contrib/admin/urls.py similarity index 100% rename from django/contrib/admin/urls/admin.py rename to django/contrib/admin/urls.py diff --git a/django/contrib/admin/urls/__init__.py b/django/contrib/admin/urls/__init__.py deleted file mode 100644 index e69de29bb2..0000000000