summaryrefslogtreecommitdiff
path: root/CIAO/tools
diff options
context:
space:
mode:
Diffstat (limited to 'CIAO/tools')
-rw-r--r--CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp1
1 files changed, 0 insertions, 1 deletions
diff --git a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
index 57aa71da9d9..958186f2f42 100644
--- a/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
+++ b/CIAO/tools/IDL3_to_XMI/IDL3_to_XMI_visitor.cpp
@@ -329,7 +329,6 @@ namespace CIAO
{
DOMElement * ele = 0;
if (this->repo_id_map_.find (ACE_TEXT_CHAR_TO_TCHAR (node->repoID ()), ele) != 0)
->>>>>>> .merge-right.r86794
{
ES_Guard class_guard (LITERALS[CLASS_TAG], this);