summaryrefslogtreecommitdiffstats
path: root/content/blog/facebook-clegg.md
diff options
context:
space:
mode:
authorMatthew Lemon <matt@matthewlemon.com>2022-07-19 07:28:09 +0100
committerMatthew Lemon <matt@matthewlemon.com>2022-07-19 07:28:09 +0100
commit3d6a71c59432b99b32a86e4c5df579f14bf7bec4 (patch)
tree573227896bce3e1e1e794a9cae1b578dce599e46 /content/blog/facebook-clegg.md
parent3f05e1e592ba91fccc06b745f0b31a10ab2a1391 (diff)
more tweaks and fleshed out reading page
Diffstat (limited to 'content/blog/facebook-clegg.md')
-rw-r--r--content/blog/facebook-clegg.md7
1 files changed, 0 insertions, 7 deletions
diff --git a/content/blog/facebook-clegg.md b/content/blog/facebook-clegg.md
index c8d3f34..20e41d8 100644
--- a/content/blog/facebook-clegg.md
+++ b/content/blog/facebook-clegg.md
@@ -3,13 +3,6 @@ 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