Skip to content
Snippets Groups Projects
Commit 4f05ea8b authored by h4-rahman's avatar h4-rahman
Browse files

Fixing merge conflicts

parent 4a190ea3
Branches
No related tags found
1 merge request!22Fixed soundfile import error and prediction results now display correctly....
Show whitespace changes
Inline Side-by-side
Showing
with 2 additions and 3 deletions
myproject/myapp/urls.py
+ 2
− 3
View file @ 4f05ea8b
...@@ -20,8 +20,7 @@ urlpatterns = [ ...@@ -20,8 +20,7 @@ urlpatterns = [
path('pricing/', pricing, name='pricing'), path('pricing/', pricing, name='pricing'),
path('generate_pdf/', generate_pdf, name='generate_pdf'), path('generate_pdf/', generate_pdf, name='generate_pdf'),
path('admin_table/', admin_table, name='admin_table'), 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/', 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')
] ]
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment