wrong merge fixed

This commit is contained in:
Qwann 2017-02-21 21:01:05 +01:00
parent 1a7df9dedb
commit 7f2f995efd

View file

@ -1,6 +1,7 @@
"""
GestionEvenmentiel URL configuration
"""
from django.conf import settings
from django.conf.urls import url, include
from django.contrib import admin