From 885069cafbb0aa3c48c77c024521c37423a48ecd Mon Sep 17 00:00:00 2001
From: AveryMadness <averyfd@shaw.ca>
Date: Tue, 23 Jan 2024 21:42:32 -0700
Subject: [PATCH] resolve your merges!!!!!

---
 src/routes/Profile.tsx | 4 ----
 src/routes/Tracks.tsx  | 4 ----
 2 files changed, 8 deletions(-)

diff --git a/src/routes/Profile.tsx b/src/routes/Profile.tsx
index 398bcf0..d95f7c6 100644
--- a/src/routes/Profile.tsx
+++ b/src/routes/Profile.tsx
@@ -120,11 +120,7 @@ export function Profile() {
 												}
 												else
 													toast(Res.data.errorMessage, { type: "error" })
-<<<<<<< HEAD
-											}}>Remove Bookmark</Button>
-=======
 											}}>Unsubscribe</Button>
->>>>>>> 824392fdeb17b22dee7e03d7a5c6a381fa7ca5a2
 										</Song>;
 									})
 									: <Text>You have no bookmarked songs.</Text>
diff --git a/src/routes/Tracks.tsx b/src/routes/Tracks.tsx
index 751acb9..30f0b2c 100644
--- a/src/routes/Tracks.tsx
+++ b/src/routes/Tracks.tsx
@@ -47,11 +47,7 @@ export function Tracks() {
                                                     }
                                                     else
                                                         toast(Res.data.errorMessage, { type: "error" })
-<<<<<<< HEAD
-                                                }}>Remove Bookmark</Button> :
-=======
                                                 }}>Unsubscribe</Button> :
->>>>>>> 824392fdeb17b22dee7e03d7a5c6a381fa7ca5a2
                                                 <Button sx={{ width: "100%", marginBottom: 1 }} variant="primary" onClick={async () => {
                                                     if (!state.UserDetails)
                                                     {