[cairo-commit] cairo ChangeLog,1.690,1.691

[Owen Taylor]

Committed by: otaylor

Update of /cvs/cairo/cairo
In directory gabe:/tmp/cvs-serv5523

Modified Files:
	ChangeLog 
Log Message:
Fix stray commit marker

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.690
retrieving revision 1.691
diff -u -d -r1.690 -r1.691
--- ChangeLog	26 Jun 2005 06:24:19 -0000	1.690
+++ ChangeLog	28 Jun 2005 12:02:27 -0000	1.691
@@ -58,7 +58,6 @@
 	(_cairo_win32_surface_set_clip_region):
 	* test/Makefile.am:
 
->>>>>>> 1.689
 2005-06-24  Carl Worth  <cworth at cworth.org>
 
 	* src/cairo-ft-font.c: (_cairo_ft_unscaled_font_create_glyph):