From 006e4dbee30b2220c8ccf31f2e75217d24f149e2 Mon Sep 17 00:00:00 2001
From: sijanec <sijanecantonluka@gmail.com>
Date: Mon, 18 May 2020 00:46:45 +0200
Subject: install

---
 bin/compose-html      | Bin 27248 -> 21752 bytes
 bin/compose-single    | Bin 27104 -> 21640 bytes
 bin/jsbundle          | Bin 13296 -> 12016 bytes
 bin/jsmin             | Bin 13664 -> 12332 bytes
 dist/js/app.js        |   2 +-
 dist/pages/about.html |   6 +-----
 dist/sw.js            |   9 ++-------
 7 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/bin/compose-html b/bin/compose-html
index 4889f0c..213ac22 100755
Binary files a/bin/compose-html and b/bin/compose-html differ
diff --git a/bin/compose-single b/bin/compose-single
index 108e083..a87f988 100755
Binary files a/bin/compose-single and b/bin/compose-single differ
diff --git a/bin/jsbundle b/bin/jsbundle
index d1bc0dc..6006263 100755
Binary files a/bin/jsbundle and b/bin/jsbundle differ
diff --git a/bin/jsmin b/bin/jsmin
index 34d72a2..9f55e0e 100755
Binary files a/bin/jsmin and b/bin/jsmin differ
diff --git a/dist/js/app.js b/dist/js/app.js
index d47437e..b2623b9 100644
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -51,6 +51,6 @@ function gsecErrorHandlerUI(err) {
 
 window.onerror = function (msg, url, lineNo, columnNo, error) {
   // ... handle error ...
-	alert("f u k");
+	console.log("error!");
   return false;
 }
diff --git a/dist/pages/about.html b/dist/pages/about.html
index 8dd6f27..e41911e 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,11 +142,7 @@
 				<div class="row">
 					<p>
 						<small>
-<<<<<<< HEAD
-							^HEAD bed93d7d52a80a05cd87c5eeacdcafde8cafe24a
-=======
-							^HEAD b0d7eb0101a6c8a26c97a1c7069e4496706225ec
->>>>>>> 837a4ad3f49cb4441d294e67332b98818fc90011
+							^HEAD 17de6574b4e4871162c81da0232b9db4113e0245
                         </small>
 					</p>
 				</div>
diff --git a/dist/sw.js b/dist/sw.js
index e703db8..7c9a581 100644
--- a/dist/sw.js
+++ b/dist/sw.js
@@ -3,13 +3,8 @@
 
 
 // Change version to cause cache refresh
-<<<<<<< HEAD
-const static_cache_name = "site-static-1.0.13-beta-bed93d7";
-// latest commit is bed93d7d52a80a05cd87c5eeacdcafde8cafe24a
-=======
-const static_cache_name = "site-static-1.0.13-beta-b0d7eb0";
-// latest commit is b0d7eb0101a6c8a26c97a1c7069e4496706225ec
->>>>>>> 837a4ad3f49cb4441d294e67332b98818fc90011
+const static_cache_name = "site-static-1.0.13-beta-17de657";
+// latest commit is 17de6574b4e4871162c81da0232b9db4113e0245
 // Got them with find . -not -path '*/\.*' | sed "s/.*/\"&\",/" | grep -v sw.js
 // sw.js NE SME BITI CACHAN, ker vsebuje verzijo!
 
-- 
cgit v1.2.3