diff options
Diffstat (limited to 'libjava')
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
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 |
