From a95c92f027dc1664fd36136eb09873e727db6c72 Mon Sep 17 00:00:00 2001
From: James <james39.smith@live.uwe.ac.uk>
Date: Tue, 12 Mar 2024 12:53:03 +0000
Subject: [PATCH] fixing merge issues
---
myproject/debug.log | 14 ++++++++++++++
myproject/myapp/forms.py | 1 -
myproject/myapp/urls.py | 4 +---
myproject/requirements.txt | 2 --
4 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/myproject/debug.log b/myproject/debug.log
index 5ab8224..7d212eb 100644
--- a/myproject/debug.log
+++ b/myproject/debug.log
@@ -423,3 +423,17 @@ Watching for file changes with StatReloader
Watching for file changes with StatReloader
/usr/src/app/myapp/forms.py changed, reloading.
Watching for file changes with StatReloader
+Watching for file changes with StatReloader
+/usr/src/app/myapp/urls.py changed, reloading.
+Watching for file changes with StatReloader
+/usr/src/app/myapp/urls.py changed, reloading.
+Watching for file changes with StatReloader
+Watching for file changes with StatReloader
+/usr/src/app/myapp/urls.py changed, reloading.
+Watching for file changes with StatReloader
+/usr/src/app/myapp/views.py changed, reloading.
+Watching for file changes with StatReloader
+/usr/src/app/myapp/views.py changed, reloading.
+Watching for file changes with StatReloader
+/usr/src/app/myapp/views.py changed, reloading.
+Watching for file changes with StatReloader
diff --git a/myproject/myapp/forms.py b/myproject/myapp/forms.py
index 57f77dc..4b0ccd7 100644
--- a/myproject/myapp/forms.py
+++ b/myproject/myapp/forms.py
@@ -1,4 +1,3 @@
-<<<<<<< myproject/myapp/forms.py
from django import forms
from django.contrib.auth.forms import UserCreationForm
from django.contrib.auth.models import User
diff --git a/myproject/myapp/urls.py b/myproject/myapp/urls.py
index 22aeca3..3fe793b 100644
--- a/myproject/myapp/urls.py
+++ b/myproject/myapp/urls.py
@@ -1,12 +1,10 @@
from django.urls import path
-<<<<<<< myproject/myapp/urls.py
from .views import index, users, maintenance, handler404, handler500, register, user_login, terms_conditions, privacy_policy, handling_music_file, pricing, generate_pdf
urlpatterns = [
# path('', index, name='index'), <- uncomment when index/main page will be ready
path('', index),
-
path('user/', users, name='users'),
path('404/', handler404),
path('500/', handler500),
@@ -17,7 +15,7 @@ urlpatterns = [
path('pricay_policy/', privacy_policy, name='privacy_policy'),
path('pricing/', pricing, name='pricing'),
path('uploading_file/', handling_music_file, name='uploading_file'),
- path('generate_pdf/', generate_pdf, name='generate_pdf')
+ path('generate_pdf/', generate_pdf, name='generate_pdf'),
path('pricing/', pricing, name='pricing'),
path('generate_pdf/', generate_pdf, name='generate_pdf')
]
diff --git a/myproject/requirements.txt b/myproject/requirements.txt
index 770ecd9..72f9567 100644
--- a/myproject/requirements.txt
+++ b/myproject/requirements.txt
@@ -2,7 +2,6 @@ asgiref==3.7.2
Django==5.0.1
django-appconf==1.0.6
django-compressor==4.4
-django-tailwind==3.8.0
mysqlclient==2.2.3
rcssmin==1.1.1
rjsmin==1.2.1
@@ -34,5 +33,4 @@ soxr==0.3.7
threadpoolctl==3.3.0
typing_extensions==4.10.0
urllib3==2.2.1
-typing_extensions==4.9.0
reportlab==4.1.0
\ No newline at end of file
--
GitLab