From: Bryce McKinlay <bryce@gcc.gnu.org>
Date: Sat, 16 Mar 2002 21:04:28 +0000 (+0000)
Subject: Remove conflict indicator.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=c2765075dbaf9350c3a37c68d634fd24c43b94a9;p=gcc.git

Remove conflict indicator.

From-SVN: r50893
---

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