summaryrefslogtreecommitdiffstats
path: root/dist
diff options
context:
space:
mode:
Diffstat (limited to 'dist')
-rw-r--r--dist/pages/about.html4
-rw-r--r--dist/sw.js5
2 files changed, 9 insertions, 0 deletions
diff --git a/dist/pages/about.html b/dist/pages/about.html
index 42c8392..40fb4da 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,7 +142,11 @@
<div class="row">
<p>
<small>
+<<<<<<< HEAD
+ ^HEAD b63b2381a851e2cbc6087bf4d355be4265e6982a
+=======
^HEAD 16d4d4b9f9b35edc7164cd5662ded7377b6960a9
+>>>>>>> 7b0e9737328c2dc5a0ff1bd063cd7818706256c3
</p>
</div>
</div>
diff --git a/dist/sw.js b/dist/sw.js
index 4a8c8e7..562b494 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-b63b238";
+// latest commit is b63b2381a851e2cbc6087bf4d355be4265e6982a
+=======
const static_cache_name = "site-static-1.0.13-beta-16d4d4b";
// latest commit is 16d4d4b9f9b35edc7164cd5662ded7377b6960a9
+>>>>>>> 7b0e9737328c2dc5a0ff1bd063cd7818706256c3
// Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
// sw.js NE SME BITI CACHAN, ker vsebuje verzijo!