From 0b307a4b92268bac00dd7d089083e45d01e3544f Mon Sep 17 00:00:00 2001
From: apbianco <apbianco@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 29 Aug 2001 02:31:55 +0000
Subject: [PATCH] Removing conflict indicators. Oops.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@45252 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/java/ChangeLog | 2 --
 1 file changed, 2 deletions(-)

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d535776b055..1bfc028c154 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -43,7 +43,6 @@
 	descriptor.
 	* class.c (make_method_value): Compute `throws' field for method.
 
->>>>>>> 1.790
 2001-08-22  Alexandre Petit-Bianco  <apbianco@redhat.com>
 
 	* parse.y (resolve_inner_class): Keep local_enclosing to NULL if
@@ -69,7 +68,6 @@
 	superclass if necessary.
 	Fixes PR java/4007
 
->>>>>>> 1.785
 2001-08-16  Tom Tromey  <tromey@redhat.com>
 
 	* jcf-dump.c (main): Updated for change to jcf_path_seal.
-- 
2.11.4.GIT