projects / platform / upstream / gcc.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9247d22)
* ChangeLog: Remove conflict indicator.
authorThomas Fitzsimmons <fitzsim@gcc.gnu.org>
Tue, 3 May 2005 23:53:58 +0000 (23:53 +0000)
committerThomas Fitzsimmons <fitzsim@gcc.gnu.org>
Tue, 3 May 2005 23:53:58 +0000 (23:53 +0000)
From-SVN: r99197

libjava/ChangeLog patch | blob | history

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 298d288..77a571c 100644 (file)
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -142,7 +142,6 @@
        * gnu/java/net/protocol/file/Connection.java
        (lineSeparator): Initialize with SystemProperties.getProperty().
 
->>>>>>> 1.3571
 2005-04-27  Chris Burdess  <dog@gnu.org>
 
        * gnu/java/net/protocol/file/Connection.java: Return correct content
Domain: System / Toolchain;