diff options
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index ed0b35ce06d..afadd005f9f 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -27,7 +27,6 @@ * configure: Rebuilt. * configure.in (GCJVERSION): Removed. ->>>>>>> 1.1201 2002-02-26 Andreas Schwab <schwab@suse.de> * acinclude.m4 (LIB_AC_PROG_CXX): Use glibjava_CXX instead of |