From f4b219cd7c1c81b1215f7a71b7d4e88ecfecf6a5 Mon Sep 17 00:00:00 2001
From: RobinLinus <robinlinus@users.noreply.github.com>
Date: Wed, 13 Mar 2019 19:59:40 +0100
Subject: [PATCH] Fix service-worker.js

---
 client/service-worker.js | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/client/service-worker.js b/client/service-worker.js
index 23cd170..a19bcac 100644
--- a/client/service-worker.js
+++ b/client/service-worker.js
@@ -1,5 +1,3 @@
-<<<<<<< Updated upstream
-=======
 var CACHE_NAME = 'snapdrop-cache-v1.042';
 var urlsToCache = [
     '/',
@@ -60,4 +58,4 @@ self.addEventListener('fetch', function(event) {
         client.postMessage({ shareTargetFile, shareTargetText });
     }());
 });
->>>>>>> Stashed changes
+