Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-07 18:44:08 +00:00
Code Issues Actions Projects Releases Wiki Activity

cleaning dirty git trace

Browse Source
This commit is contained in:
Mathieu Jaumotte 2021-06-30 19:22:26 +02:00
parent 68c0f9b7d7
commit 5861a86289
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
View File

@ -273,7 +273,6 @@
</div>
</div>
<<<<<<< HEAD
{% endif %}
{% if r.thirdParty %}