projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 2017da5)
Removed extraneous conflict marker.
authorWarren Levy <warrenl@gcc.gnu.org>
Wed, 28 Jun 2000 11:26:42 +0000 (11:26 +0000)
committerWarren Levy <warrenl@gcc.gnu.org>
Wed, 28 Jun 2000 11:26:42 +0000 (11:26 +0000)
From-SVN: r34754

libjava/ChangeLog patch | blob | history

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6c6bea8bf0a42c301624afd13a8c88b8855ad374..a7b1a17fe103fb49578ed9f35fb9a355f9b1be66 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.