From: Emilie <zawadzki@ircam.fr>
Date: Thu, 7 Jul 2016 16:33:42 +0000 (+0200)
Subject: merging
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=2dd9b109b0014ccaba233d3949c00c0d005ac502;p=mezzo.git

merging
---

2dd9b109b0014ccaba233d3949c00c0d005ac502
diff --cc app/organization/magazine/urls.py
index 6eb9a9b7,cea975ae..08d9963b
--- a/app/organization/magazine/urls.py
+++ b/app/organization/magazine/urls.py
@@@ -1,16 -1,13 +1,28 @@@
  from __future__ import unicode_literals
  
++<<<<<<< HEAD
 +from django.conf.urls import patterns, include, url
 +from django.conf.urls.i18n import i18n_patterns
 +from django.contrib import admin
++=======
+ import django.views.i18n
+ from django.conf.urls import patterns, include, url
+ from django.conf.urls.i18n import i18n_patterns
++>>>>>>> 0f089a57b9482bec7a88f169e5d5fe2688c538c4
  
  from mezzanine.core.views import direct_to_template
  from mezzanine.conf import settings
  
++<<<<<<< HEAD
 +from organization.magazine.views import *
 +
 +
 +urlpatterns = [
 +    url(r'^article/$', ArticleListView.as_view(), name="magazine-article-list"),
 +    url(r'^article/detail/(?P<slug>.*)/$', ArticleDetailView.as_view(), name="magazine-article-detail"),
++=======
+ 
+ urlpatterns = [
+ 
++>>>>>>> 0f089a57b9482bec7a88f169e5d5fe2688c538c4
  ]