1 files changed, 5 insertions, 0 deletions
diff --git a/dist/sw.js b/dist/sw.js
index 174fe60..bd3a453 100644
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -3,8 +3,13 @@
 
 
 // Change version to cause cache refresh
+<<<<<<< HEAD
 const static_cache_name = "site-static-1.0.13-beta-fa94678";
 // latest commit is fa9467811859cd9c2d595f5a79819ce3aca91e26
+=======
+const static_cache_name = "site-static-1.0.13-beta-b8d872d";
+// latest commit is b8d872d3487cbe1b6ce510bb08da799b31bd5567
+>>>>>>> b0d7eb0101a6c8a26c97a1c7069e4496706225ec
 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
 // sw.js NE SME BITI CACHAN, ker vsebuje verzijo!