From f372f5d14b070024b5b0f08adf3bcf2318e64485 Mon Sep 17 00:00:00 2001
From: sbh <sergey.belash@opencascade.com>
Date: Fri, 30 Jan 2015 11:34:59 +0300
Subject: [PATCH] Resolve rebasing errors

---
 src/PartSet/PartSet_Module.cpp | 1 +
 1 file changed, 1 insertion(+)

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
 {
-- 
2.39.2