diff options
| author | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2005-05-03 23:53:58 +0000 |
|---|---|---|
| committer | Thomas Fitzsimmons <fitzsim@gcc.gnu.org> | 2005-05-03 23:53:58 +0000 |
| commit | 1d1fafea50e57058ee5e7ccdb93ee7656a5944d8 (patch) | |
| tree | 5dd69889f3122f76038375891d300ee0e48aa3f7 | |
| parent | 9247d229f65bc56a6fc285e0341eff74a830af76 (diff) | |
| download | gcc-1d1fafea50e57058ee5e7ccdb93ee7656a5944d8.zip gcc-1d1fafea50e57058ee5e7ccdb93ee7656a5944d8.tar.gz gcc-1d1fafea50e57058ee5e7ccdb93ee7656a5944d8.tar.bz2 | |
* ChangeLog: Remove conflict indicator.
From-SVN: r99197
| -rw-r--r-- | libjava/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog index 298d288..77a571c 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 |