diff options
| author | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 2001-08-28 19:31:55 -0700 |
|---|---|---|
| committer | Alexandre Petit-Bianco <apbianco@gcc.gnu.org> | 2001-08-28 19:31:55 -0700 |
| commit | 8dfa3e5380408574e438590c34fa29cd598b713b (patch) | |
| tree | 38b39eaba819af63342315ee73dd3a70f7930b1e /gcc | |
| parent | 1ca09b48783dfa5f4e4037b2c95681ea7c33626f (diff) | |
| download | gcc-8dfa3e5380408574e438590c34fa29cd598b713b.zip gcc-8dfa3e5380408574e438590c34fa29cd598b713b.tar.gz gcc-8dfa3e5380408574e438590c34fa29cd598b713b.tar.bz2 | |
Removing conflict indicators. Oops.
From-SVN: r45252
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/java/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index d535776..1bfc028 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. |