cleaning dirty git trace

2025-08-20 22:53:49 +00:00 · 2021-06-30 19:22:26 +02:00
parent 68c0f9b7d7
commit 5861a86289
1 changed files with 0 additions and 1 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
@@ -273,7 +273,6 @@
                  </div>
              </div>

-<<<<<<< HEAD
          {% endif %}
          {% if r.thirdParty %}