From: Alexandre Petit-Bianco <apbianco@gcc.gnu.org>
Date: Wed, 29 Aug 2001 02:31:55 +0000 (-0700)
Subject: Removing conflict indicators. Oops.
X-Git-Tag: prereleases/libstdc++-3.0.95~2373
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8dfa3e5380408574e438590c34fa29cd598b713b;p=thirdparty%2Fgcc.git

Removing conflict indicators. Oops.

From-SVN: r45252
---

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index d535776b055b..1bfc028c1542 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.