projects / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3bb6567)
Remove conflict indicator.
authorBryce McKinlay <bryce@gcc.gnu.org>
Sat, 16 Mar 2002 21:04:28 +0000 (21:04 +0000)
committerBryce McKinlay <bryce@gcc.gnu.org>
Sat, 16 Mar 2002 21:04:28 +0000 (21:04 +0000)
From-SVN: r50893

libjava/ChangeLog patch | blob | history

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 01ad71a5010cba511d37f48f4c95db81efaa84bd..193607a6d9b421f08a86e24c2025964089026541 100644 (file)
--- 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