From: Philippe Barbosa <contact@philippebarbosa.com>
Date: Tue, 22 Mar 2016 17:01:26 +0000 (+0100)
Subject: fix conflict
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a9680defd0e67b7c46f8d9ab9d65e7bfbdf0f9b4;p=mezzo.git

fix conflict
---

a9680defd0e67b7c46f8d9ab9d65e7bfbdf0f9b4
diff --cc app/templates/agenda/event_list.html
index 0da98be3,15c55047..1cfa6e8c
--- a/app/templates/agenda/event_list.html
+++ b/app/templates/agenda/event_list.html
@@@ -98,8 -98,7 +98,8 @@@
      {% block event_list_event_content %}
          {% editable event.content %}
              <div class="event__description">
-                 {{ event.description_from_content|safe }}
+                 {{ event.description|safe }}
 +                <a href="{{ event.get_absolute_url }}" class="event__meta__cta">{% trans "read more" %}</a>
              </div>
          {% endeditable %}
      {% endblock %}