From: sbh <sergey.belash@opencascade.com>
Date: Mon, 9 Feb 2015 09:54:43 +0000 (+0300)
Subject: Merge problems fix
X-Git-Tag: V_1.1.0~207^2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=3296d470f5d06a259a1b6a790d39dab09c552b20;p=modules%2Fshaper.git

Merge problems fix
---

diff --git a/src/ModuleBase/ModuleBase_IModule.h b/src/ModuleBase/ModuleBase_IModule.h
index 32c7cdcbf..b500dd6f8 100644
--- a/src/ModuleBase/ModuleBase_IModule.h
+++ b/src/ModuleBase/ModuleBase_IModule.h
@@ -131,9 +131,6 @@ protected slots:
   /// Register properties of this module
   virtual void registerProperties() {}
 
-  /// Register properties of this module
-  virtual void registerProperties() {}
-
   /// Returns new instance of operation object (used in createOperation for customization)
   virtual ModuleBase_Operation* getNewOperation(const std::string& theFeatureId);