* ChangeLog: Remove conflict indicator.

From-SVN: r99197

* ChangeLog: Remove conflict indicator.
From-SVN: r99197
1d1fafea · Thomas Fitzsimmons · 9247d229 · 1d1fafea
Commit 1d1fafea authored May 03, 2005 by Thomas Fitzsimmons
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 1 deletions

libjava/ChangeLog
+0 -1

No files found.
--- 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