From 57c561748c06b3351031137e9e36595738c2073f Mon Sep 17 00:00:00 2001
From: rstular <rok@stular.eu>
Date: Tue, 2 Jun 2020 16:01:05 +0200
Subject: Github actions fix

---
 dist/js/app.js | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'dist/js')

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")
-- 
cgit v1.2.3