Spurious left-over conflict marker.

diff --git a/bedstead.c b/bedstead.c
index b99e3974dc77bd092177d2860f1408795dbdb765..e907c13903984f1de35c6dda21ffc7b5f5af55a1 100644 (file)
--- 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" },