Fix bad merge

src/api/QGCCorePlugin.h

@@ -58,11 +58,6 @@ public:
     /// @return true: Show settings ui, false: Hide settings ui
     virtual bool overrideSettingsGroupVisibility        (QString name);
 
-    /// Allows the core plugin to override the default value for the specified setting
-    ///     @param name - Setting group name
-    /// @return true: Show settings ui, false: Hide settings ui
-    virtual bool overrideSettingsGroupVisibility(QString name);
-
     /// Allows the core plugin to override the default value for the specified setting
     ///     @param name - Setting name
     ///     @param defaultValue - Standard default value for setting