diff options
| author | bala <balanatarajan@users.noreply.github.com> | 2000-03-13 23:24:34 +0000 |
|---|---|---|
| committer | bala <balanatarajan@users.noreply.github.com> | 2000-03-13 23:24:34 +0000 |
| commit | 41a82dd0991039e9d5ecaa6415527b27b1b603fc (patch) | |
| tree | dcc079d28cb951ea5d9e1bb94e70edc2502a3488 | |
| parent | 3d61a5eb2726a6f1a642d46360f3a9037df0dbb9 (diff) | |
| download | ATCD-41a82dd0991039e9d5ecaa6415527b27b1b603fc.tar.gz | |
There was a >>>>> in the file.
| -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 9aa8748836d..6ce2f0d0782 100644 --- a/TAO/ChangeLogs/ChangeLog-02a +++ b/TAO/ChangeLogs/ChangeLog-02a @@ -44,7 +44,6 @@ Sun Mar 12 18:42:26 2000 Pradeep Gore <pradeep@flamenco.cs.wustl.edu> * orbsvcs/orbsvcs/orbsvcs_static.dsp: Updated Notify files. ->>>>>>> 1.312 Sun Mar 12 10:23:21 2000 Pradeep Gore <pradeep@flamenco.cs.wustl.edu> * orbsvcs/orbsvcs/Notify/Notify_Types.cpp: |