From c76b04f294567c3d76ac74d93882832fa7c6b90f Mon Sep 17 00:00:00 2001 From: Stein Magnus Jodal Date: Mon, 21 Jul 2014 10:07:54 +0200 Subject: [PATCH] docs: Fix merge conflict --- docs/clients/http.rst | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/clients/http.rst b/docs/clients/http.rst index 220e07bf..bbd4d888 100644 --- a/docs/clients/http.rst +++ b/docs/clients/http.rst @@ -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 =================