projects
/
gcc.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9247d22
)
* ChangeLog: Remove conflict indicator.
author
Thomas Fitzsimmons
<fitzsim@gcc.gnu.org>
Tue, 3 May 2005 23:53:58 +0000
(23:53 +0000)
committer
Thomas 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 298d2880267aa813b1028518b38b68b254367b86..77a571ca96619642b02bb0da6651971236c6867e 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