diff options
Diffstat (limited to '')
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | dist/pages/about.html | 4 | ||||
| -rw-r--r-- | dist/sw.js | 5 |
3 files changed, 11 insertions, 0 deletions
@@ -1 +1,3 @@ **/.commit +dist/sw.js +dist/pages/about.html 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> @@ -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! |