Sulley
/
Ultron
1
0
Fork 0
Code Issues 15 Pull Requests 1 Projects Releases Wiki Activity

Rebase on master to take Note and Report functionnalities

This commit is contained in:
Gregory Trullemans 2022-09-30 10:29:48 +02:00
parent 79153bc034
commit 5da2861016
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ultron/followup/urls.py
View File

@ -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/",