Mirrors/koel
2
0
Fork 0
mirror of https://github.com/koel/koel synced 2024-11-10 22:54:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Resolve unresolved conflicts

Browse source
This commit is contained in:
An Phan 2016-06-05 19:12:43 +08:00
parent 91f978c753
commit 080b0aac64
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/Services/Lastfm.php
View file

@ -45,11 +45,7 @@ class Lastfm extends RESTfulService
*
* @return bool
*/
<<<<<<< HEAD
public function used()
=======
public function usingLastfm()
>>>>>>> 48023f52be5e72c60bfdbd2c317e6ee775bc5049
{
return env('LASTFM_API_KEY') && env('LASTFM_API_SECRET');
}