diff options
| author | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-16 21:04:28 +0000 |
|---|---|---|
| committer | bryce <bryce@138bc75d-0d04-0410-961f-82ee72b054a4> | 2002-03-16 21:04:28 +0000 |
| commit | c7a64824cd33d7daca7793e55678acd6046ad126 (patch) | |
| tree | 4fd7ffd4011ab0b3250e2fb811ee2fc720b4eeff /libjava | |
| parent | 11fb533020bd3520aeae3e4f4929d2ea390a815b (diff) | |
| download | ppe42-gcc-c7a64824cd33d7daca7793e55678acd6046ad126.tar.gz ppe42-gcc-c7a64824cd33d7daca7793e55678acd6046ad126.zip | |
Remove conflict indicator.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@50893 138bc75d-0d04-0410-961f-82ee72b054a4
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 01ad71a5010..193607a6d9b 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 |
