mirror of
https://github.com/librespot-org/librespot.git
synced 2024-11-08 16:45:43 +00:00
Fixing merge requests
This commit is contained in:
parent
4f0033e81c
commit
5d2897f6f6
1 changed files with 0 additions and 5 deletions
|
@ -130,13 +130,8 @@ pub trait Metadata: Send + Sized + 'static {
|
|||
fn request_url(id: SpotifyId) -> String;
|
||||
fn parse(msg: &Self::Message, session: &Session) -> Self;
|
||||
|
||||
<<<<<<< HEAD
|
||||
fn get(session: &Session, id: SpotifyId) -> Box<dyn Future<Item = Self, Error = MercuryError>> {
|
||||
let uri = format!("{}/{}", Self::base_url(), id.to_base16());
|
||||
=======
|
||||
fn get(session: &Session, id: SpotifyId) -> Box<Future<Item = Self, Error = MercuryError>> {
|
||||
let uri = Self::request_url(id);
|
||||
>>>>>>> Make standard metadata get handle also playlists
|
||||
let request = session.mercury().get(uri);
|
||||
|
||||
let session = session.clone();
|
||||
|
|
Loading…
Reference in a new issue