Resolve rebasing errors

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index 26da028d4defbeaad4d903e78c3b957ed78b7948..49323976a568ca433a2a268280d81d1d98c6a945 100644 (file)
--- a/src/PartSet/PartSet_Module.cpp
+++ b/src/PartSet/PartSet_Module.cpp
@@ -210,6 +210,7 @@ bool PartSet_Module::canDisplayObject(const ObjectPtr& theObject) const
     aCanDisplay = ModuleBase_IModule::canDisplayObject(theObject);
   }
   return aCanDisplay;
+}
 
 void PartSet_Module::addViewerItems(QMenu* theMenu) const
 {