Fix typo

From-SVN: r23663

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7e2db9f4749f1524cf0c9374b0c63c9b8434e2a3..046eab4675fae7b60520ec62a56943a5a089c1c5 100644 (file)
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -28,7 +28,6 @@ Sun Nov 15 14:36:29 1998  Per Bothner  <bothner@cygnus.com>
        (- case PREDECREMENT_EXPR etc):  Remove redundant NOTE_PUSH.
        (generate_classfile):  More robust for abstract methods.
 
->>>>>>> 1.51
 Sun Nov 15 13:52:39 1998  Anthony Green  <green@cygnus.com>
 
        * Makefile.in: jv-scan and jvgenmain all require libiberty.