wrong merge fixed
This commit is contained in:
parent
1a7df9dedb
commit
7f2f995efd
1 changed files with 1 additions and 0 deletions
|
@ -1,6 +1,7 @@
|
|||
"""
|
||||
GestionEvenmentiel URL configuration
|
||||
"""
|
||||
from django.conf import settings
|
||||
from django.conf.urls import url, include
|
||||
from django.contrib import admin
|
||||
|
||||
|
|
Loading…
Reference in a new issue