From 3d6a71c59432b99b32a86e4c5df579f14bf7bec4 Mon Sep 17 00:00:00 2001
From: Matthew Lemon <matt@matthewlemon.com>
Date: Tue, 19 Jul 2022 07:28:09 +0100
Subject: more tweaks and fleshed out reading page

---
 content/blog/facebook-clegg.md | 7 -------
 1 file changed, 7 deletions(-)

(limited to 'content/blog/facebook-clegg.md')

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
-- 
cgit v1.2.3