summaryrefslogtreecommitdiffstats
path: root/dist/pages/about.html
diff options
context:
space:
mode:
Diffstat (limited to 'dist/pages/about.html')
-rw-r--r--dist/pages/about.html4
1 files changed, 4 insertions, 0 deletions
diff --git a/dist/pages/about.html b/dist/pages/about.html
index a32a331..8dd6f27 100644
--- a/dist/pages/about.html
+++ b/dist/pages/about.html
@@ -142,7 +142,11 @@
<div class="row">
<p>
<small>
+<<<<<<< HEAD
^HEAD bed93d7d52a80a05cd87c5eeacdcafde8cafe24a
+=======
+ ^HEAD b0d7eb0101a6c8a26c97a1c7069e4496706225ec
+>>>>>>> 837a4ad3f49cb4441d294e67332b98818fc90011
</small>
</p>
</div>