Fixing merge requests
@@ -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();
