Commit d2935e6f authored by wesbos's avatar wesbos
Browse files

fixes the merge conflict

parents c5f29aba 2edd4ad4
...@@ -156,6 +156,7 @@ A collective list of JSON APIs for use in web development. ...@@ -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/) | | Spotify | Music | No | [Go!](https://developer.spotify.com/web-api/migration-guide/) |
| Musixmatch | Music | No, but `apikey` query string | [Go!](https://developer.musixmatch.com/) | | Musixmatch | Music | No, but `apikey` query string | [Go!](https://developer.musixmatch.com/) |
| Musikki | Music | No | [Go!](https://music-api.musikki.com/reference) | | 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 ### Open Source projects
| API | Description | OAuth |Link | | API | Description | OAuth |Link |
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment