Fixing commits problem
authorRemixDev <deezloaderremix@gmail.com>
Fri, 1 Feb 2019 17:54:54 +0000 (18:54 +0100)
committerRemixDev <deezloaderremix@gmail.com>
Fri, 1 Feb 2019 17:54:54 +0000 (18:54 +0100)
app/lib/deezer-api/index.js

index 707487904b5b537f0b8f68388885e92c98b8f42d..6e2d11ca352acff58031b361bfa4f2a4c05591c1 100644 (file)
@@ -218,11 +218,7 @@ module.exports = class Deezer {
 
   async getLyrics(id){
     var body = await this.apiCall(`song.getLyrics`, {sng_id: id})
-<<<<<<< HEAD
     var lyr = {}
-=======
-    let lyr = {}
->>>>>>> afa09933a18b19028318124311da71f93f4cc3f7
     lyr.unsyncLyrics = {
       description: "",
       lyrics: body.results.LYRICS_TEXT