resolve your merges!!!!!
This commit is contained in:
parent
14c7eaf239
commit
885069cafb
|
@ -120,11 +120,7 @@ export function Profile() {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
toast(Res.data.errorMessage, { type: "error" })
|
toast(Res.data.errorMessage, { type: "error" })
|
||||||
<<<<<<< HEAD
|
|
||||||
}}>Remove Bookmark</Button>
|
|
||||||
=======
|
|
||||||
}}>Unsubscribe</Button>
|
}}>Unsubscribe</Button>
|
||||||
>>>>>>> 824392fdeb17b22dee7e03d7a5c6a381fa7ca5a2
|
|
||||||
</Song>;
|
</Song>;
|
||||||
})
|
})
|
||||||
: <Text>You have no bookmarked songs.</Text>
|
: <Text>You have no bookmarked songs.</Text>
|
||||||
|
|
|
@ -47,11 +47,7 @@ export function Tracks() {
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
toast(Res.data.errorMessage, { type: "error" })
|
toast(Res.data.errorMessage, { type: "error" })
|
||||||
<<<<<<< HEAD
|
|
||||||
}}>Remove Bookmark</Button> :
|
|
||||||
=======
|
|
||||||
}}>Unsubscribe</Button> :
|
}}>Unsubscribe</Button> :
|
||||||
>>>>>>> 824392fdeb17b22dee7e03d7a5c6a381fa7ca5a2
|
|
||||||
<Button sx={{ width: "100%", marginBottom: 1 }} variant="primary" onClick={async () => {
|
<Button sx={{ width: "100%", marginBottom: 1 }} variant="primary" onClick={async () => {
|
||||||
if (!state.UserDetails)
|
if (!state.UserDetails)
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue
Block a user