claudep/eds
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge conflict

Browse source
This commit is contained in:
alazo 2017-02-20 20:34:38 +01:00
commit 901366a9dd
3 changed files with 31 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

8
templates/cms/index.html
View file

@ -80,7 +80,11 @@
<td class="l6 p">{{P09.url|safe}}</td>
<td colspan="2" class="l6 m">{{M16_1a.url_code|safe}} / {{M16_1b.url_code|safe}} / {{M16_1c.url_code|safe}} / {{M16_1d.url_code|safe}} / {{M16_1e.url_code|safe}}</td>
<td colspan="2" class="l6 m">{{M16_2a.url_code|safe}}</td>
<<<<<<< HEAD
<td colspan="2" class="l6 m">{{M16_3a.url_code|safe}} / {{M16_3b.url_code|safe}} / {{M16_3c.url_code|safe}} / {{M16_3d.url_code|safe}} / {{M16_3e.url_code|safe}}</td>
=======
<td colspan="2" class="l6 m">{{M16_3a.url_code|safe}} / {{M16_3b.url_code|safe}} / {{M16_3c.url_code|safe}} / {{M16_3d.url_code|safe}}</td>
>>>>>>> 52cca0ce67c3fff10578bd13d8a9d4f1c0b77de5
</tr>
<!-- Ligne 7 -->
<tr>
@ -101,6 +105,10 @@
<br/>
<a href="{% url 'plan-pdf' %}">Imprimer en PDF</a>
</div>
<<<<<<< HEAD
=======
>>>>>>> 52cca0ce67c3fff10578bd13d8a9d4f1c0b77de5
{% endblock %}