From 30b69a4902ac3738219b2d33393463a356b42b28 Mon Sep 17 00:00:00 2001
From: green <green@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 15 Nov 1998 15:12:48 +0000
Subject: [PATCH] Fix typo

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@23663 138bc75d-0d04-0410-961f-82ee72b054a4
---
 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