summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbala <balanatarajan@users.noreply.github.com>2002-12-01 04:23:14 +0000
committerbala <balanatarajan@users.noreply.github.com>2002-12-01 04:23:14 +0000
commit055c6c72fcea2c43e9b73faaf9e195c7b3bfd593 (patch)
tree36eed8b93a27ce029cf7461df6dfcee9af0ec96b
parent5f707897dfef4f50d2d97e01a4175c770238573a (diff)
downloadATCD-055c6c72fcea2c43e9b73faaf9e195c7b3bfd593.tar.gz
Cosmetic fix.
-rw-r--r--TAO/ChangeLog1
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog
index 4e216bc5e67..e2b4e60b62e 100644
--- a/TAO/ChangeLog
+++ b/TAO/ChangeLog
@@ -441,7 +441,6 @@ Tue Nov 26 22:32:06 2002 Balachandran Natarajan <bala@isis-server.isis.vanderb
Thanks to Duane Binder <duane.binder@veritas.com> for donating
this test case.
->>>>>>> 1.896
Tue Nov 26 16:03:52 2002 Balachandran Natarajan <bala@isis-server.isis.vanderbilt.edu>
* tests/Bug_1020_Basic_Regression/run_test.pl: