summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
Diffstat (limited to 'content')
-rw-r--r--content/_index.md3
-rw-r--r--content/blog/facebook-clegg.md7
2 files changed, 9 insertions, 1 deletions
diff --git a/content/_index.md b/content/_index.md
index bfc0cf0..e9f54cf 100644
--- a/content/_index.md
+++ b/content/_index.md
@@ -1,3 +1,4 @@
-# Toss!
+ There is not much to see from the top of this particular mountain.
+
<img src="/img/poser_guy.png" alt="Me Me on a mountain" style="margin-left: 0px;">
</div>
diff --git a/content/blog/facebook-clegg.md b/content/blog/facebook-clegg.md
index 20e41d8..c8d3f34 100644
--- a/content/blog/facebook-clegg.md
+++ b/content/blog/facebook-clegg.md
@@ -3,6 +3,13 @@ title: Nick Clegg is a total trumpet
date: 2021-10-31
draft: false
---
+<<<<<<< HEAD
And so is the other guy, obviously...
{{< youtube pDCtkB1IZWk >}}
+=======
+And so is the other guy...
+
+{{< youtube pDCtkB1IZWk >}}
+
+>>>>>>> gutcss