From dd16be2aac20db1bfdeb2966e41db3d70d8eab08 Mon Sep 17 00:00:00 2001
From: Anthony Green <green@gcc.gnu.org>
Date: Sun, 15 Nov 1998 15:12:48 +0000
Subject: [PATCH] Fix typo

From-SVN: r23663
---
 gcc/java/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 7e2db9f..046eab4 100644
--- 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.
-- 
2.7.4