summaryrefslogtreecommitdiff
path: root/site/index.html
diff options
context:
space:
mode:
Diffstat (limited to 'site/index.html')
-rwxr-xr-xsite/index.html20
1 files changed, 12 insertions, 8 deletions
diff --git a/site/index.html b/site/index.html
index 926ddb7..f40a030 100755
--- a/site/index.html
+++ b/site/index.html
@@ -10,15 +10,11 @@ cat << EOF
</div>
- <div class="image">
- <img src="/images/remotecontrol.gif">
- </div>
-</div>
EOF
cat << EOF
- <div>
+<div class="posts">
<h2>blog posts</h2>
<ul>
@@ -40,19 +36,27 @@ for file in $entries; do
cat << EOF
</ul>
+</div>
EOF
cat << EOF
- <div class="left">
+<<<<<<< HEAD
+ <div class="main-image">
+ <img src="/images/remotecontrol.gif">
+ </div>
+
+ <div>
<h2 id="donate">donate</h2>
<p>if you like what i do and you want to support me, consider donating <a href="https://www.getmonero.org/">Monero</a></p>
<code>49ECi71yshT6kvzFJKyvVDXLarVp9EGR54ZUw9ebqPetKn2kbaRavFG4FCG4MALkGXVZ16KM5c92MJ7vDWL7iwFs66Q1UQ2</code>
</div>
- <div class="right">
+
+ <div>
<h2 id="contact">contact</h2>
<p>if you want to contact me, you can message me on matrix <code>@ix:davidovski.xyz</code>, XMPP <code>ix@davidovski.xyz</code>, or via the email linked at the top of the page.</p>
- </div>
+ </div>
+</div>
EOF