[cairo-commit] ROADMAP

[Carl Worth]

 ROADMAP |    1 -
 1 files changed, 1 deletion(-)

New commits:
diff-tree ab092a9a5db70ac16e782cf0d7d3629cc902cc1e (from 328024cc25cba67c939cf51da6ab6409635fa227)
Author: Carl Worth <cworth at cworth.org>
Date:   Fri Aug 18 14:25:53 2006 -0700

    ROADMAP: Remove stray conflict marker

diff --git a/ROADMAP b/ROADMAP
index 1650616..5294cad 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -30,7 +30,6 @@ from mozilla, (clip querying), and much-
 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