diff options
| author | Dan McGee <dan@archlinux.org> | 2012-03-23 20:19:34 -0500 |
|---|---|---|
| committer | Dan McGee <dan@archlinux.org> | 2012-03-23 20:19:34 -0500 |
| commit | 822898e57bc6d4e008ef58da309857e9ef8c98e6 (patch) | |
| tree | 1af0836c927b87e2249628d47cdfefe77c3b18fd /todolists/urls.py | |
| parent | ea87160c397fe1daf63851f0ed0be146bea79196 (diff) | |
| parent | 8e10699d53281be53c88a3695de6aa496e084dc6 (diff) | |
Merge branch 'django14'
Conflicts:
templates/releng/result_section.html
Diffstat (limited to 'todolists/urls.py')
| -rw-r--r-- | todolists/urls.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/todolists/urls.py b/todolists/urls.py index 0bd8817b..a379468f 100644 --- a/todolists/urls.py +++ b/todolists/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls.defaults import patterns +from django.conf.urls import patterns from django.contrib.auth.decorators import permission_required from .views import DeleteTodolist |