From d766f5af2b59ede34479dcce54b368c3bf816d2b Mon Sep 17 00:00:00 2001 From: rstular Date: Tue, 2 Jun 2020 16:07:57 +0200 Subject: Preparing to merge --- dist/js/app.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'dist/js/app.js') 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") -- cgit v1.2.3