Partypacker-Archive/Partypack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolve your merges!!!!!

Browse Source
This commit is contained in:
AveryMadness 2024-01-23 21:42:32 -07:00
parent 14c7eaf239
commit 885069cafb
2 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/Profile.tsx
View File

@ -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>

4
src/routes/Tracks.tsx
View File

@ -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)
{