[cairo-commit] cairo ChangeLog,1.364,1.365

[Kristian Hogsberg]

Committed by: krh

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

Modified Files:
	ChangeLog 
Log Message:
Argh, committed conflict marker in ChangeLog - fixed.

Index: ChangeLog
===================================================================
RCS file: /cvs/cairo/cairo/ChangeLog,v
retrieving revision 1.364
retrieving revision 1.365
diff -u -d -r1.364 -r1.365
--- ChangeLog	7 Feb 2005 17:38:43 -0000	1.364
+++ ChangeLog	7 Feb 2005 18:15:46 -0000	1.365
@@ -107,7 +107,6 @@
 	* test/cairo_test.c (xasprintf): Add a simple fixed-buffer size
 	snprintf fallback in the absence of vasnprintf.
  
->>>>>>> 1.363
 2005-02-01  Kristian Høgsberg  <krh at redhat.com>
 
 	* src/cairo_pdf_surface.c (_cairo_pdf_surface_composite): Pretend