From 3e678a32842b1890efa20194dd05f18ad36901a0 Mon Sep 17 00:00:00 2001
From: jcass <john.cass77@gmail.com>
Date: Sat, 18 Feb 2017 14:25:31 +0200
Subject: [PATCH] Fix merge conflicts.

---
 mopidy_musicbox_webclient/static/mb.appcache | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mopidy_musicbox_webclient/static/mb.appcache b/mopidy_musicbox_webclient/static/mb.appcache
index d32dd12..6495c83 100644
--- a/mopidy_musicbox_webclient/static/mb.appcache
+++ b/mopidy_musicbox_webclient/static/mb.appcache
@@ -1,6 +1,6 @@
 CACHE MANIFEST
 
-# 2017-02-18:v1
+# 2017-02-18:v2
 
 NETWORK:
 *