From 3296d470f5d06a259a1b6a790d39dab09c552b20 Mon Sep 17 00:00:00 2001
From: sbh <sergey.belash@opencascade.com>
Date: Mon, 9 Feb 2015 12:54:43 +0300
Subject: [PATCH] Merge problems fix

---
 src/ModuleBase/ModuleBase_IModule.h | 3 ---
 1 file changed, 3 deletions(-)

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);
 
-- 
2.39.2