summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorroot <root@lalalizard.com>2013-02-10 13:23:55 -0500
committerroot <root@lalalizard.com>2013-02-10 13:23:55 -0500
commitdc3547066e7b56db8b435e3ab685af14725d18e2 (patch)
tree623f20669d3536686c3d8e20af1d75a9cfc21ab2
parent2be402bd54629ca440e81919d1a846d2b1c42934 (diff)
django 1.4 upgrade
-rw-r--r--scannerjammer/urls.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/scannerjammer/urls.py b/scannerjammer/urls.py
index c3c08c3..885d3a1 100644
--- a/scannerjammer/urls.py
+++ b/scannerjammer/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls import patterns, include, url
+from django.conf.urls.defaults import *
from django.contrib.staticfiles.urls import staticfiles_urlpatterns
# Uncomment the next two lines to enable the admin: