From 85a262233a3647ef886f0fa21d8f76d99620a7f4 Mon Sep 17 00:00:00 2001
From: Brody Wilton <brodywilton@hotmail.com>
Date: Sun, 24 Mar 2024 23:52:03 +0000
Subject: [PATCH] Add PayPal integration- need to link in new model for
 usertokens

---
 myproject/myapp/urls.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/myproject/myapp/urls.py b/myproject/myapp/urls.py
index ef1b499..a71097f 100644
--- a/myproject/myapp/urls.py
+++ b/myproject/myapp/urls.py
@@ -1,7 +1,11 @@
 from django.urls import path
 
+<<<<<<< HEAD
+from .views import InstrumentDetectionView, index, users, maintenance, handler404, handler500, terms_conditions, privacy_policy, handling_music_file, pricing, generate_pdf, admin_table
+=======
 from .views import InstrumentDetectionView, index, users, maintenance, handler404, handler500, register, user_login, terms_conditions, privacy_policy, handling_music_file, pricing, generate_pdf, admin_table
 from .payments import create_payment, execute_payment, payment_cancelled, payment_success
+>>>>>>> 7991a04 (Add PayPal integration- need to link in new model for usertokens)
 from django.contrib.auth import views as auth_views
 
 # Authentication
-- 
GitLab