From fc7e85669d8325f4c9cf337035b70ac05bb9ea84 Mon Sep 17 00:00:00 2001
From: dogstick <ricbottomley@gmail.com>
Date: Wed, 9 Jul 2014 18:02:01 +0100
Subject: [PATCH] fixed urls import for 1.6 with backwards compatability

---
 locking/urls.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/locking/urls.py b/locking/urls.py
index f7388e8..1ee5369 100644
--- a/locking/urls.py
+++ b/locking/urls.py
@@ -1,4 +1,8 @@
-from django.conf.urls.defaults import *
+import django
+if django.VERSION >= (1, 6):
+    from django.conf.urls import patterns
+else:
+   from django.conf.urls.defaults import patterns
 
 urlpatterns = patterns('locking.views',
     # verwijst naar een ajax-view voor het lockingmechanisme