summaryrefslogtreecommitdiffstats
path: root/dist/pages/about.html
diff options
context:
space:
mode:
authorsijanec <sijanecantonluka@gmail.com>2020-05-18 00:04:55 +0200
committersijanec <sijanecantonluka@gmail.com>2020-05-18 00:04:55 +0200
commitddf6845360ec16e64af93df99d8163ca32b29992 (patch)
tree8aefb6ee371084ece9b023b12f8b22bbd006f096 /dist/pages/about.html
parentcss .p => p (diff)
downloadbeziapp-ddf6845360ec16e64af93df99d8163ca32b29992.tar
beziapp-ddf6845360ec16e64af93df99d8163ca32b29992.tar.gz
beziapp-ddf6845360ec16e64af93df99d8163ca32b29992.tar.bz2
beziapp-ddf6845360ec16e64af93df99d8163ca32b29992.tar.lz
beziapp-ddf6845360ec16e64af93df99d8163ca32b29992.tar.xz
beziapp-ddf6845360ec16e64af93df99d8163ca32b29992.tar.zst
beziapp-ddf6845360ec16e64af93df99d8163ca32b29992.zip
Diffstat (limited to '')
-rw-r--r--dist/pages/about.html6
1 files changed, 1 insertions, 5 deletions
diff --git a/dist/pages/about.html b/dist/pages/about.html
index bb04c16..d357ecf 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,11 +142,7 @@
<div class="row">
<p>
<small>
-<<<<<<< HEAD
- ^HEAD fa9467811859cd9c2d595f5a79819ce3aca91e26
-=======
- ^HEAD b8d872d3487cbe1b6ce510bb08da799b31bd5567
->>>>>>> b0d7eb0101a6c8a26c97a1c7069e4496706225ec
+ ^HEAD b989d252515d9d8e636f1c86cdfb71bb68938a30
</small>
</p>
</div>