From 4f05ea8b658119f56be0f8e1a004eec59a5a4831 Mon Sep 17 00:00:00 2001
From: h4-rahman <hamidur2.rahman@live.uwe.ac.uk>
Date: Tue, 19 Mar 2024 12:31:00 +0000
Subject: [PATCH] Fixing merge conflicts
---
myproject/myapp/urls.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/myproject/myapp/urls.py b/myproject/myapp/urls.py
index 37ec9c8..304d047 100644
--- a/myproject/myapp/urls.py
+++ b/myproject/myapp/urls.py
@@ -20,8 +20,7 @@ urlpatterns = [
path('pricing/', pricing, name='pricing'),
path('generate_pdf/', generate_pdf, name='generate_pdf'),
path('admin_table/', admin_table, name='admin_table'),
- path('instrument_detection/', InstrumentDetectionView.as_view(), name='instrument_detection')
-
+ path('instrument_detection/', InstrumentDetectionView.as_view(), name='instrument_detection'),
path('password_change/', auth_views.PasswordChangeView.as_view(template_name='password_change_form.html'), name='password_change'),
- path('password_change/done/', auth_views.PasswordChangeDoneView.as_view(template_name='password_change_done.html'), name='password_change_done'),
+ path('password_change/done/', auth_views.PasswordChangeDoneView.as_view(template_name='password_change_done.html'), name='password_change_done')
]
--
GitLab