Merge problems fix

diff --git a/src/ModuleBase/ModuleBase_IModule.h b/src/ModuleBase/ModuleBase_IModule.h
index 32c7cdcbfb7df17206a47373efb8f5b4d516ee3a..b500dd6f82ae3f97b4dbcb1498eabbf87925f4cc 100644 (file)
--- 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() {}
 \r
-  /// Register properties of this module\r
-  virtual void registerProperties() {}\r
-\r
   /// Returns new instance of operation object (used in createOperation for customization)\r
   virtual ModuleBase_Operation* getNewOperation(const std::string& theFeatureId);\r
 \r