diff options
| -rw-r--r-- | TAO/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/TAO/ChangeLog b/TAO/ChangeLog index f12a194be0d..0ede84c6a77 100644 --- a/TAO/ChangeLog +++ b/TAO/ChangeLog @@ -481,7 +481,6 @@ Mon Oct 26 10:52:01 UTC 2009 Vladimir Zykov <vladimir.zykov@prismtech.com> * tao/Acceptor_Impl.cpp: Uncommented code for a fix for bug#3748. ->>>>>>> .r87276 Thu Oct 22 10:47:21 UTC 2009 Johnny Willemsen <jwilllemsen@remedy.nl> * TAO_IDL/TAO_IDL_ACE.mwc: |