From 1d1fafea50e57058ee5e7ccdb93ee7656a5944d8 Mon Sep 17 00:00:00 2001
From: Thomas Fitzsimmons <fitzsim@gcc.gnu.org>
Date: Tue, 3 May 2005 23:53:58 +0000
Subject: [PATCH] * ChangeLog: Remove conflict indicator.

From-SVN: r99197
---
 libjava/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 298d288..77a571c 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
-- 
2.7.4