fix conflict in CHANGELOG

src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig

@@ -37,6 +37,9 @@
 
     <fieldset>
         <legend><h2>{{ 'General information'|trans }}</h2></legend>
+        {%- if form.civility is defined -%}
+        {{ form_row(form.civility, {'label' : 'Civility'}) }}
+        {% endif %}
         {{ form_row(form.firstName, {'label' : 'First name'}) }}
         {{ form_row(form.lastName, {'label' : 'Last name'}) }}
         {% if form.altNames is defined %}
@@ -95,6 +98,8 @@
             <div id="personEmail">
                 {{ form_row(form.email, {'label': 'Email'}) }}
             </div>
+        {% endif %}
+        {%- if form.acceptEmail is defined -%}
             <div id="personAcceptEmail">
                 {{ form_row(form.acceptEmail, {'label' : 'Accept emails ?'}) }}
             </div>
@@ -135,12 +140,11 @@
             </button>
         </li>
     </ul>
-
     {{ form_end(form) }}
 
 </div>
 {% endblock %}
 
 {% block js %}
-    {{ encore_entry_link_tags('page_person') }}
+    {{ encore_entry_script_tags('page_person') }}
 {% endblock %}

src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig

@@ -51,6 +51,15 @@ This view should receive those arguments:
             <figure class="person-details">
                 <h2 class="chill-red">{{ 'General information'|trans }}</h2>
                 <dl>
+                    {% if person.civility is not null %}
+                        <dt>{{ 'Civility'|trans }}&nbsp;:</dt>
+                        <dd>
+                        {% if person.civility.name|length > 0 %}
+                        {{ person.civility.name|first }}
+                        {% endif %}
+                        </dd>
+                    {% endif %}
+
                     <dt>{{ 'First name'|trans }}&nbsp;:</dt>
                     <dd>{{ person.firstName }}</dd>