summaryrefslogtreecommitdiffstats
path: root/dist/js/app.js
diff options
context:
space:
mode:
authorrstular <rok@stular.eu>2020-06-02 16:07:57 +0200
committerrstular <rok@stular.eu>2020-06-02 16:07:57 +0200
commitd766f5af2b59ede34479dcce54b368c3bf816d2b (patch)
tree4c993a985eaa072eda88e33a7647ad3600a12dc4 /dist/js/app.js
parentGithub actions fix (diff)
downloadbeziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.gz
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.bz2
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.lz
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.xz
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.tar.zst
beziapp-d766f5af2b59ede34479dcce54b368c3bf816d2b.zip
Diffstat (limited to '')
-rwxr-xr-xdist/js/app.js6
1 files changed, 1 insertions, 5 deletions
diff --git a/dist/js/app.js b/dist/js/app.js
index 339215b..623d86d 100755
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -3,11 +3,7 @@
const app_version = "1.0.14-beta";
-<<<<<<< HEAD
-const previous_commit = "aebac8bcd0e946f1e7283d8e280e301d52b8d64b";
-=======
-const previous_commit = "35b595f806f99ca18365d511ab820ab818da348d";
->>>>>>> f06c121... Github actions fix
+const previous_commit = "f06c1210549f0e6c81b72c6f51b811304e8cd7c4";
if ("serviceWorker" in navigator) {
navigator.serviceWorker.register("/sw.js")