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

---
 dist/pages/about.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'dist/pages')

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