fixes the merge conflict

This commit is contained in:
wesbos 2016-06-29 10:40:52 -04:00
commit d2935e6f91

View File

@ -156,6 +156,7 @@ A collective list of JSON APIs for use in web development.
| Spotify | Music | No | [Go!](https://developer.spotify.com/web-api/migration-guide/) |
| Musixmatch | Music | No, but `apikey` query string | [Go!](https://developer.musixmatch.com/) |
| Musikki | Music | No | [Go!](https://music-api.musikki.com/reference) |
| Songsterr | Provides guitar, bass and drums tabs and chords | No | [Go!](https://www.songsterr.com/a/wa/api/) |
### Open Source projects
| API | Description | OAuth |Link |