[commit-cp] classpath ChangeLog

[Keith Seitz]

CVSROOT:        /sources/classpath
Module name:    classpath
Changes by:     Keith Seitz <keiths>    06/06/16 18:43:44

Modified files:
        .              : ChangeLog 

Log message:
        delete spurious CVS conflict markers

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/classpath/ChangeLog?cvsroot=classpath&r1=1.7852&r2=1.7853

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/classpath/classpath/ChangeLog,v
retrieving revision 1.7852
retrieving revision 1.7853
diff -u -b -r1.7852 -r1.7853
--- ChangeLog   16 Jun 2006 18:32:48 -0000      1.7852
+++ ChangeLog   16 Jun 2006 18:43:44 -0000      1.7853
@@ -355,7 +355,6 @@
        (Java_gnu_java_awt_peer_gtk_GtkImage_getPixels): Return when array
        cannot be allocated.
 
->>>>>>> 1.7848
 2006-06-14  Tom Tromey  <address@hidden>
 
        PR java/28024:
@@ -449,7 +448,6 @@
        compatibility with filters.
        (getParameter): Modified to allow access to above. 
 
->>>>>>> 1.7824
 2006-06-13  Sven de Marothy  <address@hidden>
 
        * gnu/java/awt/peer/gtk/CairoSurface.java
@@ -471,7 +469,6 @@
        or not the labels are visible,
        (paintTrack): Shift track down one pixel.
 
->>>>>>> 1.7799
 2006-06-13  Lillian Angel  <address@hidden>
 
        * java/awt/image/PixelGrabber.java
@@ -1242,7 +1239,6 @@
        (TreeIncrementAction.actionPerformed): Use action name as command.
        (TreeIncrementAction.isEnabled): Implemented.
 
->>>>>>> 1.7796
 2006-06-08  Mark Wielaard  <address@hidden>
 
        PR 27917