1 files changed, 0 insertions, 1 deletions
diff --git a/ROADMAP b/ROADMAP
index 1650616ef..5294cadfc 100644
--- a/ROADMAP
+++ b/ROADMAP
@@ -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