From f3b7d3dfd8d2bec03969bc5a52fb41473b88c747 Mon Sep 17 00:00:00 2001
From: Owen Taylor <otaylor@redhat.com>
Date: Tue, 28 Jun 2005 05:02:27 +0000
Subject: [PATCH] Fix stray commit marker

---
 ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index dbdaaff8f..8472c04c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -58,7 +58,6 @@
 	(_cairo_win32_surface_set_clip_region):
 	* test/Makefile.am:
 
->>>>>>> 1.689
 2005-06-24  Carl Worth  <cworth@cworth.org>
 
 	* src/cairo-ft-font.c: (_cairo_ft_unscaled_font_create_glyph):