diff options
| author | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-03-16 21:04:28 +0000 |
|---|---|---|
| committer | Bryce McKinlay <bryce@gcc.gnu.org> | 2002-03-16 21:04:28 +0000 |
| commit | c2765075dbaf9350c3a37c68d634fd24c43b94a9 (patch) | |
| tree | 4fd7ffd4011ab0b3250e2fb811ee2fc720b4eeff /libjava | |
| parent | 3bb656728597694f7b2ea7d9c72787fe0800cc96 (diff) | |
| download | gcc-c2765075dbaf9350c3a37c68d634fd24c43b94a9.zip gcc-c2765075dbaf9350c3a37c68d634fd24c43b94a9.tar.gz gcc-c2765075dbaf9350c3a37c68d634fd24c43b94a9.tar.bz2 | |
Remove conflict indicator.
From-SVN: r50893
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 01ad71a..193607a 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -106,7 +106,6 @@ * java/lang/natObject.cc: Move thread synchronization primitives to system-dependent headers. ->>>>>>> 1.1231 2002-03-09 Adam Megacz <adam@xwt.org> * java/io/natFileDescriptorWin32.cc (read): Return -1 if zero |