From 42f0fe09d51a0dd48bdcd999406c69063c6f3bc5 Mon Sep 17 00:00:00 2001
From: fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Tue, 3 May 2005 23:53:58 +0000
Subject: 	* ChangeLog: Remove conflict indicator.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99197 138bc75d-0d04-0410-961f-82ee72b054a4
---
 libjava/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

(limited to 'libjava')

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
-- 
cgit v1.2.3