From: sbh <sergey.belash@opencascade.com>
Date: Fri, 30 Jan 2015 08:34:59 +0000 (+0300)
Subject: Resolve rebasing errors
X-Git-Tag: V_1.0.0~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=f372f5d14b070024b5b0f08adf3bcf2318e64485;p=modules%2Fshaper.git

Resolve rebasing errors
---

diff --git a/src/PartSet/PartSet_Module.cpp b/src/PartSet/PartSet_Module.cpp
index 26da028d4..49323976a 100644
--- 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
 {