summaryrefslogtreecommitdiffstats
path: root/dist/pages
diff options
context:
space:
mode:
authorsijanec <sijanecantonluka@gmail.com>2020-05-18 00:46:45 +0200
committersijanec <sijanecantonluka@gmail.com>2020-05-18 00:46:45 +0200
commit006e4dbee30b2220c8ccf31f2e75217d24f149e2 (patch)
tree22664127bd71f22556c732b332facfbea6384560 /dist/pages
parentmerge (diff)
downloadbeziapp-006e4dbee30b2220c8ccf31f2e75217d24f149e2.tar
beziapp-006e4dbee30b2220c8ccf31f2e75217d24f149e2.tar.gz
beziapp-006e4dbee30b2220c8ccf31f2e75217d24f149e2.tar.bz2
beziapp-006e4dbee30b2220c8ccf31f2e75217d24f149e2.tar.lz
beziapp-006e4dbee30b2220c8ccf31f2e75217d24f149e2.tar.xz
beziapp-006e4dbee30b2220c8ccf31f2e75217d24f149e2.tar.zst
beziapp-006e4dbee30b2220c8ccf31f2e75217d24f149e2.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 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>