From 93a4a916442c2402e97ba853a29e8c1310294e74 Mon Sep 17 00:00:00 2001
From: aba <aba@opencascade.com>
Date: Wed, 25 Jan 2017 12:56:51 +0300
Subject: [PATCH] Correct rebase errors

---
 src/XDEDRAW/XDEDRAW_Common.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/XDEDRAW/XDEDRAW_Common.cxx b/src/XDEDRAW/XDEDRAW_Common.cxx
index bbac0fdf49..a186f67c9f 100644
--- a/src/XDEDRAW/XDEDRAW_Common.cxx
+++ b/src/XDEDRAW/XDEDRAW_Common.cxx
@@ -832,7 +832,7 @@ TDF_Label ReadVrmlRec(const OSD_Path& thePath, const Handle(TDocStd_Document)& t
         ReadVrmlRec(aSubDirPath, theDoc, aNewLabel);
       }
 
-      aShapeTool->UpdateAssembly(aNewLabel);
+      aShapeTool->UpdateAssemblies();
     }
     // At the end of operation update assemblies
   }
@@ -985,7 +985,7 @@ TDF_Label ReadVrmlNode (const Handle(VrmlData_Node)& theNode,
       ReadVrmlNode (anIt.Value (), theDoc, aNewLabel);
     }
 
-    aShapeTool->UpdateAssembly (aNewLabel);
+    aShapeTool->UpdateAssemblies();
   }
 
   return aNewLabel;
@@ -1082,7 +1082,7 @@ bool ReadSingleVrml (const OSD_Path& thePath, const Handle (TDocStd_Document)& t
   {
     ReadVrmlNode (anIt.Value (), theDoc, aNewLabel);
   }
-  aShapeTool->UpdateAssembly (aNewLabel);
+  aShapeTool->UpdateAssemblies();
 
   return true;
 }
-- 
2.39.5