1 files changed, 2 insertions, 7 deletions
diff --git a/dist/sw.js b/dist/sw.js
index e703db8..7c9a581 100644
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -3,13 +3,8 @@
 
 
 // Change version to cause cache refresh
-<<<<<<< HEAD
-const static_cache_name = "site-static-1.0.13-beta-bed93d7";
-// latest commit is bed93d7d52a80a05cd87c5eeacdcafde8cafe24a
-=======
-const static_cache_name = "site-static-1.0.13-beta-b0d7eb0";
-// latest commit is b0d7eb0101a6c8a26c97a1c7069e4496706225ec
->>>>>>> 837a4ad3f49cb4441d294e67332b98818fc90011
+const static_cache_name = "site-static-1.0.13-beta-17de657";
+// latest commit is 17de6574b4e4871162c81da0232b9db4113e0245
 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
 // sw.js NE SME BITI CACHAN, ker vsebuje verzijo!