summaryrefslogtreecommitdiff
path: root/site
diff options
context:
space:
mode:
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>