From 01b639783f1e0386a09a950704935e7b0e07803a Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Fri, 30 Sep 2022 10:35:30 +0200
Subject: [PATCH] Bug fix in followup/urls.py file

---
 ultron/followup/urls.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ultron/followup/urls.py b/ultron/followup/urls.py
index d9ba3c8b10..681b4447ed 100644
--- a/ultron/followup/urls.py
+++ b/ultron/followup/urls.py
@@ -74,7 +74,6 @@ urlpatterns = [
         name="remove_jump_chrono_value"
     ),
     path(r"chrono/detailed_score_for_date_range/<int:gymnast_id>/<int:routine_type>/<str:date_begin>/<str:date_end>/", views.average_jump_chrono_details_between_two_date, name="average_jump_chrono_details_between_two_date"),
->>>>>>> 31a996c (CTRL+Z)
 
 
     path(r"learnedskill/add/", views.learnedskill_create_or_update, name="learnedskill_create"),