andpp/mopidy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

docs: Fix merge conflict

Browse Source
This commit is contained in:
Stein Magnus Jodal 2014-07-21 10:07:54 +02:00
parent e12b507568
commit c76b04f294
1 changed files with 0 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docs/clients/http.rst
View File

@ -83,8 +83,6 @@ A Mopidy web client made by Argonaut in SF for their office jukebox.
-- http://blog.argonautinc.com/post/83027259908/music-is-pretty-important-to-our-culture-and
<<<<<<< HEAD
=======
Mopify
======
@ -99,7 +97,6 @@ Mopidy and the Spotify web APIs.
-- https://github.com/dirkgroenen/Mopify
>>>>>>> develop
Other web clients
=================