Add support for Google CBLC/CBDT color bitmaps
diff --git a/Doc/documentation.html b/Doc/documentation.html
index 748f5f7..0c9bead 100644
--- a/Doc/documentation.html
+++ b/Doc/documentation.html
@@ -42,7 +42,11 @@
The following tables are currently supported:
<BLOCKQUOTE><TT>
<!-- begin table list -->
+<<<<<<< HEAD
BASE, CFF, DSIG, EBDT, EBLC, GDEF, GMAP, GPKG, GPOS, GSUB, JSTF, LTSH, META, OS/2, SING, TSI0, TSI1, TSI2, TSI3, TSI5, TSIB, TSID, TSIJ, TSIP, TSIS, TSIV, VORG, cmap, cvt, fpgm, gasp, glyf, hdmx, head, hhea, hmtx, kern, loca, maxp, name, post, prep, vhea and vmtx
+=======
+BASE, CBDT, CBLC, CFF, COLR, CPAL, DSIG, EBDT, EBLC, GDEF, GMAP, GPKG, GPOS, GSUB, JSTF, LTSH, META, OS/2, SING, TSI0, TSI1, TSI2, TSI3, TSI5, TSIB, TSID, TSIJ, TSIP, TSIS, TSIV, VORG, cmap, cvt, fpgm, gasp, glyf, hdmx, head, hhea, hmtx, kern, loca, maxp, name, post, prep, vhea and vmtx
+>>>>>>> 305bad8... Add support for Google CBLC/CBDT color bitmaps
<!-- end table list -->
</TT></BLOCKQUOTE>
Other tables are dumped as hexadecimal data.