fix merge

qgis · Jun 8, 2017 · a7c9cc8 · a7c9cc8
1 parent 41ceed3
commit a7c9cc8
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/python/core/symbology-ng/qgssinglesymbolrenderer.sip b/python/core/symbology-ng/qgssinglesymbolrenderer.sip
@@ -35,12 +35,6 @@ class QgsSingleSymbolRenderer : QgsFeatureRenderer
 
     virtual void toSld( QDomDocument &doc, QDomElement &element, const QgsStringMap &props = QgsStringMap() ) const;
     static QgsFeatureRenderer *createFromSld( QDomElement &element, QgsWkbTypes::GeometryType geomType );
-<<<<<<< Updated upstream
-=======
-%Docstring
- :rtype: QgsFeatureRenderer
-%End
->>>>>>> Stashed changes
 
     virtual QgsFeatureRenderer::Capabilities capabilities();
     virtual QgsSymbolList symbols( QgsRenderContext &context );