Fix rebase errors

2016-09-22 20:03:45 +02:00
parent 92a294f6aa
commit 3debf0d29e
3 changed files with 25 additions and 6 deletions
--- a/src/Gui/ViewProviderDocumentObjectGroup.cpp
+++ b/src/Gui/ViewProviderDocumentObjectGroup.cpp
@@ -65,8 +65,6 @@ ViewProviderDocumentObjectGroup::~ViewProviderDocumentObjectGroup()
 {
 }

-#else
-    Q_UNUSED(prop);
 std::vector<std::string> ViewProviderDocumentObjectGroup::getDisplayModes(void) const
 {
    // empty