Skip to content
Permalink
Browse files

fix merge

  • Loading branch information
3nids committed Jun 8, 2017
1 parent 41ceed3 commit a7c9cc8133a001c426a17206eb31ab8a852008ec
Showing with 0 additions and 6 deletions.
  1. +0 −6 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 );

0 comments on commit a7c9cc8

Please sign in to comment.
You can’t perform that action at this time.