ROADMAP: Remove stray conflict marker

This commit is contained in:
Carl Worth 2006-08-18 14:25:53 -07:00
parent 328024cc25
commit ab092a9a5d

View file

@ -30,7 +30,6 @@ from mozilla, (clip querying), and much-improved performance.
Themes and Schedules
====================
cairo-1.2.4 (August 21, 2006): Fix build bugs with 1.2.2
<<<<<<< .merge_file_3a6nj4
✓- xlib detection requires libXt
✓- SVG backend requires PNG
✓- 7888: assertion failure with rotated bitmap glyphs