summaryrefslogtreecommitdiff
path: root/site
diff options
context:
space:
mode:
authordavidovski <david@davidovski.xyz>2024-11-14 17:14:38 +0000
committerdavidovski <david@davidovski.xyz>2024-11-14 17:14:38 +0000
commit46822036ad1c0aca3de841db932e599cf8ad4e71 (patch)
tree415a6820fbd58f67306862e3de2abeb61e20bb4a /site
parentb7e29e3284f7ee44503f9e3da4d7b02bb4bca29b (diff)
remove the head oopsHEADmaster
Diffstat (limited to 'site')
-rwxr-xr-xsite/index.html1
1 files changed, 0 insertions, 1 deletions
diff --git a/site/index.html b/site/index.html
index f40a030..20ba229 100755
--- a/site/index.html
+++ b/site/index.html
@@ -40,7 +40,6 @@ cat << EOF
EOF
cat << EOF
-<<<<<<< HEAD
<div class="main-image">
<img src="/images/remotecontrol.gif">
</div>