diff options
Diffstat (limited to 'TAO/tao/PollableS.cpp')
| -rw-r--r-- | TAO/tao/PollableS.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/TAO/tao/PollableS.cpp b/TAO/tao/PollableS.cpp index 4c0f72f8a65..3e615df051a 100644 --- a/TAO/tao/PollableS.cpp +++ b/TAO/tao/PollableS.cpp @@ -31,6 +31,10 @@ ACE_RCSID(tao, PollableS, "$Id$") +<<<<<<< PollableS.cpp +ACE_RCSID(tao, PollableS, "$Id$") +======= +>>>>>>> 1.9.2.2 class TAO_CORBA_Pollable_Perfect_Hash_OpTable : public TAO_Perfect_Hash_OpTable { |