summaryrefslogtreecommitdiffstats
path: root/dist/js/app.js
diff options
context:
space:
mode:
Diffstat (limited to 'dist/js/app.js')
-rwxr-xr-xdist/js/app.js4
1 files changed, 4 insertions, 0 deletions
diff --git a/dist/js/app.js b/dist/js/app.js
index 6daa06c..339215b 100755
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -3,7 +3,11 @@
const app_version = "1.0.14-beta";
+<<<<<<< HEAD
const previous_commit = "aebac8bcd0e946f1e7283d8e280e301d52b8d64b";
+=======
+const previous_commit = "35b595f806f99ca18365d511ab820ab818da348d";
+>>>>>>> f06c121... Github actions fix
if ("serviceWorker" in navigator) {
navigator.serviceWorker.register("/sw.js")