From: Warren Levy <warrenl@gcc.gnu.org>
Date: Wed, 28 Jun 2000 11:26:42 +0000 (+0000)
Subject: Removed extraneous conflict marker.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=580ac503925ca3b85efd84cc3cf666ad7f659ef7;p=gcc.git

Removed extraneous conflict marker.

From-SVN: r34754
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 6c6bea8bf0a..a7b1a17fe10 100644
--- 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.