diff options
| author | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-03 23:53:58 +0000 |
|---|---|---|
| committer | fitzsim <fitzsim@138bc75d-0d04-0410-961f-82ee72b054a4> | 2005-05-03 23:53:58 +0000 |
| commit | 42f0fe09d51a0dd48bdcd999406c69063c6f3bc5 (patch) | |
| tree | 5dd69889f3122f76038375891d300ee0e48aa3f7 | |
| parent | 43efdf10a782c76515e45996fbaddf272af44bc2 (diff) | |
| download | ppe42-gcc-42f0fe09d51a0dd48bdcd999406c69063c6f3bc5.tar.gz ppe42-gcc-42f0fe09d51a0dd48bdcd999406c69063c6f3bc5.zip | |
* ChangeLog: Remove conflict indicator.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@99197 138bc75d-0d04-0410-961f-82ee72b054a4
| -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 |
