From 5861a86289a734b5f7eb3dfea43bacd4ec80c2ff Mon Sep 17 00:00:00 2001
From: Mathieu Jaumotte <mathieu.jaumotte@champs-libres.coop>
Date: Wed, 30 Jun 2021 19:22:26 +0200
Subject: [PATCH] cleaning dirty git trace

---
 .../Resources/views/AccompanyingCourse/index.html.twig           | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig
index 76dde2837..4d911e1e6 100644
--- 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 %}