[commit-cp] classpath ChangeLog

[Robert Schuster]

CVSROOT:        /cvsroot/classpath
Module name:    classpath
Changes by:     Robert Schuster <rschuster>     06/06/16 12:37:05

Modified files:
        .              : ChangeLog 

Log message:
        Removed CVS' conflict indicators.

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

Patches:
Index: ChangeLog
===================================================================
RCS file: /cvsroot/classpath/classpath/ChangeLog,v
retrieving revision 1.7839
retrieving revision 1.7840
diff -u -b -r1.7839 -r1.7840
--- ChangeLog   16 Jun 2006 12:36:19 -0000      1.7839
+++ ChangeLog   16 Jun 2006 12:37:04 -0000      1.7840
@@ -162,7 +162,6 @@
        Added serialization UID and changed to extend
        javax.management.JMException.
        
->>>>>>> 1.7826
 2006-06-14  Lillian Angel  <address@hidden>
 
        * java/awt/Component.java
@@ -341,7 +340,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
@@ -363,7 +361,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
@@ -1134,7 +1131,6 @@
        (TreeIncrementAction.actionPerformed): Use action name as command.
        (TreeIncrementAction.isEnabled): Implemented.
 
->>>>>>> 1.7796
 2006-06-08  Mark Wielaard  <address@hidden>
 
        PR 27917