From 68802e2540dcd7e8bf292533d45eb1bdd7cfc0ac Mon Sep 17 00:00:00 2001
From: Ben Harris <bjh21@bjh21.me.uk>
Date: Fri, 1 Nov 2013 21:27:45 +0000
Subject: [PATCH] Spurious left-over conflict marker.

---
 bedstead.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/bedstead.c b/bedstead.c
index b99e397..e907c13 100644
--- a/bedstead.c
+++ b/bedstead.c
@@ -513,7 +513,6 @@ struct glyph {
  {{005,012,016,021,037,021,021,000,000}, 0x00c3, "Atilde" },
  {{017,024,024,036,024,024,027,000,000}, 0x00c6, "AE" },
  {{016,021,020,020,020,021,016,004,010}, 0x00c7, "Ccedilla" },
-<<<<<<< TREE
  {{010,004,037,020,036,020,037,000,000}, 0x00c8, "Egrave" },
  {{004,012,037,020,036,020,037,000,000}, 0x00ca, "Ecircumflex" },
  {{012,000,037,020,036,020,037,000,000}, 0x00cb, "Edieresis" },
-- 
2.30.2