diff options
| author | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-02-06 19:00:16 +0000 |
|---|---|---|
| committer | Ossama Othman <ossama-othman@users.noreply.github.com> | 2006-02-06 19:00:16 +0000 |
| commit | cd3d90765816ed4652f2bb6fcc5dd45c7ce5dfeb (patch) | |
| tree | 55ebaa3aa0af47ca6f689e5987678f3788100a79 | |
| parent | ce192d18aa6aec86e9c07cca7fc25a17fbb300af (diff) | |
| download | ATCD-cd3d90765816ed4652f2bb6fcc5dd45c7ce5dfeb.tar.gz | |
Removed left-over CVS conflict marks
| -rw-r--r-- | TAO/CIAO/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/CIAO/ChangeLog b/TAO/CIAO/ChangeLog index 7e594db1177..0fa04f211b0 100644 --- a/TAO/CIAO/ChangeLog +++ b/TAO/CIAO/ChangeLog @@ -1084,7 +1084,6 @@ Fri Jan 6 20:09:34 UTC 2006 Jeff Parsons <j.parsons@vanderbilt.edu> Updated the hand-crafted descriptor files in CIAO tests and examples to reflect the changes above. ->>>>>>> 1.1632 Thu Jan 5 21:28:17 UTC 2006 Gan Deng <gan.deng@vanderbilt.edu> * DAnCE/NodeApplicationManager/NodeApplicationManager_Impl.cpp |