Removing conflict indicators. Oops.

From-SVN: r45252

Removing conflict indicators. Oops.
From-SVN: r45252
8dfa3e53 · Alexandre Petit-Bianco · 1ca09b48 · 8dfa3e53
Commit 8dfa3e53 authored Aug 28, 2001 by Alexandre Petit-Bianco
Show whitespace changes
Inline Side-by-side

Showing with 0 additions and 2 deletions

gcc/java/ChangeLog
+0 -2

No files found.
--- 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.