diff options
| author | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 00:41:39 +0000 |
|---|---|---|
| committer | parsons <parsons@ae88bc3d-4319-0410-8dbf-d08b4c9d3795> | 2000-08-26 00:41:39 +0000 |
| commit | 47fc190d4bd4d8cb6f1a32bf4f0a4ed34d778ccd (patch) | |
| tree | b74a1c5a56250fa355d90f67b88049e2148ac72b | |
| parent | 800858166e7f0d5a40ffe2e4cde5173042c73d49 (diff) | |
| download | ATCD-47fc190d4bd4d8cb6f1a32bf4f0a4ed34d778ccd.tar.gz | |
Removed
>>>>>>> 1.1308
| -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 c32a9fd2a8b..4309925bc70 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -51,7 +51,6 @@ Fri Aug 25 11:20:13 2000 Priyanka Gontla <pgontla@ece.uci.edu> * orbsvcs/tests/Interoperable_Naming/Makefile: Modified the order in which the files are compiled. ->>>>>>> 1.1308 Thu Aug 24 21:03:11 2000 Jeff Parsons <parsons@cs.wustl.edu> * TAO_IDL/Makefile: |