From: Thomas Fitzsimmons <fitzsim@gcc.gnu.org>
Date: Tue, 3 May 2005 23:53:58 +0000 (+0000)
Subject: * ChangeLog: Remove conflict indicator.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1d1fafea50e57058ee5e7ccdb93ee7656a5944d8;p=gcc.git

* ChangeLog: Remove conflict indicator.

From-SVN: r99197
---

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 298d2880267..77a571ca966 100644
--- 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