From 7b41388f8eb7be4e8250fe9f69194cf70f1a103b Mon Sep 17 00:00:00 2001
From: sijanec <sijanecantonluka@gmail.com>
Date: Tue, 9 Jun 2020 19:10:37 +0200
Subject: i think merge should work now. see commit details below:

the old configure script did some weird stuff with the dist/ folder,
as some files are already there in the js/ folder that are duplicated
and empty.

the new make generate script should fix that and work as expected.

all files are there as far as I know.
---
 dist/pages/about.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'dist/pages')

diff --git a/dist/pages/about.html b/dist/pages/about.html
index aedba8d..9fc3725 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -160,7 +160,7 @@
 				<div class="row">
 					<p>
 						<small>
-							^HEAD f4c921fdfbae7845996128d0994be32760ffc977
+							^HEAD 855d322a78e4575e34500ba0b093f716b8631c30
 						</small>
 					</p>
 				</div>
-- 
cgit v1.2.3