From: Ben Harris <bjh21@bjh21.me.uk>
Date: Fri, 1 Nov 2013 21:29:10 +0000 (+0000)
Subject: More merge fixes
X-Git-Tag: bedstead-001.000~65
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~bjharris/git?a=commitdiff_plain;h=93dd8a482429064940aa9ee431932c6dc053d147;p=bedstead.git

More merge fixes
---

diff --git a/bedstead.c b/bedstead.c
index e907c13..2dc3dd1 100644
--- a/bedstead.c
+++ b/bedstead.c
@@ -589,16 +589,15 @@ struct glyph {
  {{011,011,022,000,000,000,000,000,000}, 0x201d, "quotedblright" },
  {{000,000,000,000,000,011,011,022,000}, 0x201e, "quotedblbase" },
  {{022,022,011,000,000,000,000,000,000}, 0x201f }, /* quotedblreversed */
+ {{000,000,016,016,016,000,000,000,000}, 0x2022, "bullet" },
+ {{012,012,012,012,012,000,012,000,000}, 0x203c, "exclamdbl" },
+ {{030,024,030,022,027,022,021,000,000}, 0x20a7, "peseta" },
  {{016,021,035,033,033,035,031,021,016}, 0x2117 }, /* phonographic */
  {{020,020,020,020,022,005,002,005,002}, 0x215b, "oneeighth" },
  {{020,010,020,010,022,005,002,005,002}, 0x215c, "threeeighths" },
  {{030,020,030,010,022,005,002,005,002}, 0x215d, "fiveeighths" },
  {{034,004,010,020,022,005,002,005,002}, 0x215e, "seveneighths" },
  {{000,004,004,025,016,004,000,000,000}, 0x2193, "arrowdown" },
- {{000,000,016,016,016,000,000,000,000}, 0x2022, "bullet" },
- {{012,012,012,012,012,000,012,000,000}, 0x203c, "exclamdbl" },
- {{030,024,030,022,027,022,021,000,000}, 0x20a7, "peseta" },
- {{000,004,004,025,016,004,000,000,000}, 0x2193, "arrowdown", SA },
  {{004,016,025,004,025,016,004,000,000}, 0x2195, "arrowupdn" },
  {{004,016,025,004,025,016,037,000,000}, 0x21a8, "arrowupdnbse" },
  {{000,004,010,023,010,004,000,000,000}, -1, "arrowleft.alt" },