Extensions: Fix rebase errors

2016-08-25 17:50:31 +02:00
parent cdd33738bb
commit 2a61aec97b
7 changed files with 36 additions and 28 deletions
--- a/src/App/DocumentObjectGroup.cpp
+++ b/src/App/DocumentObjectGroup.cpp
@@ -61,7 +61,7 @@ namespace App {
 /// @cond DOXERR
 PROPERTY_SOURCE_TEMPLATE(App::DocumentObjectGroupPython, App::DocumentObjectGroup)
 template<> const char* App::DocumentObjectGroupPython::getViewProviderName(void) const {
-    return "Gui::ViewProviderGroupExtensionPython";
+    return "Gui::ViewProviderDocumentObjectGroupPython";
 }
 template<> PyObject* App::DocumentObjectGroupPython::getPyObject(void) {
    if (PythonObject.is(Py::_None())) {