From 41a759812ec1ed66c938117ac050625ad7b9d91c Mon Sep 17 00:00:00 2001
From: Gregory Trullemans <redj@MacBook-Pro-de-Gregory.local>
Date: Fri, 30 Sep 2022 10:29:48 +0200
Subject: [PATCH] Rebase on master to take Note and Report functionnalities

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

diff --git a/ultron/followup/urls.py b/ultron/followup/urls.py
index 0edd598d29..63771c1915 100644
--- a/ultron/followup/urls.py
+++ b/ultron/followup/urls.py
@@ -18,10 +18,6 @@ urlpatterns = [
     ),
     path(r"chrono/edit/<int:chrono_id>/", views.chrono_create_or_update, name="chrono_update"),
     path(r"chrono/details/<int:chrono_id>/", views.jump_chrono_details, name="jump_chrono_details"),
-<<<<<<< HEAD
-=======
-    path(r"chrono/details/<int:chrono_id>/", views.jump_chrono_details, name="jump_chrono_details"),
->>>>>>> 5b32509 (Rebase on master to take Note and Report functionnalities)
     path(r"chrono/details/<int:chrono_id>/add/", views.jump_chrono_values_create_or_update, name="jump_chrono_values_create_or_update"),
     path(
         r"chrono/add_jump_chrono_value/",