From 83edeaa6f879addbc83c61aee48264b89661dda1 Mon Sep 17 00:00:00 2001
From: Tania Bento <tbento@redhat.com>
Date: Tue, 24 Oct 2006 13:59:47 +0000
Subject: *** empty log message ***

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

diff --git a/ChangeLog b/ChangeLog
index f6ccf1120..6b718fbbb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -66,7 +66,6 @@
 
 	* include/gnu_java_awt_peer_gtk_CairoGraphics2D.h: Added missing constants.
 
->>>>>>> 1.8716
 2006-10-19  Francis Kung  <fkung@redhat.com>
 
 	PR 29510
-- 
cgit v1.2.1