From 7f2f995efd4196fc473d686d279c2db2ca42a671 Mon Sep 17 00:00:00 2001 From: Qwann Date: Tue, 21 Feb 2017 21:01:05 +0100 Subject: [PATCH] wrong merge fixed --- evenementiel/urls.py | 1 + 1 file changed, 1 insertion(+) diff --git a/evenementiel/urls.py b/evenementiel/urls.py index 32c17ee..eff7989 100644 --- a/evenementiel/urls.py +++ b/evenementiel/urls.py @@ -1,6 +1,7 @@ """ GestionEvenmentiel URL configuration """ +from django.conf import settings from django.conf.urls import url, include from django.contrib import admin