diff options
-rw-r--r-- | TAO/ChangeLogs/ChangeLog-02a | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLogs/ChangeLog-02a b/TAO/ChangeLogs/ChangeLog-02a index d8542c7f44d..1eeab73c142 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -79,7 +79,6 @@ Tue Jun 27 10:45:17 2000 Priyanka Gontla <pgontla@ece.uci.edu> * tao/ORB.cpp : Removed the file_string_to_object function as it is no longer needed. ->>>>>>> 1.996.2.6 Mon Jun 26 14:56:42 2000 Carlos O'Ryan <coryan@uci.edu> |