mirror/bedstead
1
0
Fork 1
mirror of https://bjh21.me.uk/bedstead/.git synced 2026-08-06 12:24:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Spurious left-over conflict marker.

Browse Source
This commit is contained in:
Ben Harris 2013-11-01 21:27:45 +00:00
parent 5055c00061
commit 68802e2540
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bedstead.c
View File

@ -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" },