Removed extraneous conflict marker.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@34754 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6c6bea8..a7b1a17 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -674,7 +674,6 @@
        * include/i386-signal.h (MAKE_THROW_FRAME): Ditto.
        * include/ppc-signal.h: New file.
 
->>>>>>> 1.385
 2000-05-18  Bryce McKinlay  <bryce@albatross.co.nz>
 
        * java/lang/Thread.java: Declare `data' as Object, not RawData.