Skip to content

Commit

Permalink
fix rebase issues
Browse files Browse the repository at this point in the history
  • Loading branch information
m-kuhn committed Oct 15, 2018
1 parent a05e787 commit 97a9659
Showing 1 changed file with 0 additions and 6 deletions.
Expand Up @@ -70,12 +70,6 @@ class ANALYSIS_EXPORT QgsGeometryDuplicateCheck : public QgsGeometryCheck
static QString factoryId();
static QgsGeometryCheck::CheckType factoryCheckType();

static QList<QgsWkbTypes::GeometryType> factoryCompatibleGeometryTypes() {return {QgsWkbTypes::PointGeometry, QgsWkbTypes::LineGeometry, QgsWkbTypes::PolygonGeometry}; }
static bool factoryIsCompatible( QgsVectorLayer *layer ) SIP_SKIP { return factoryCompatibleGeometryTypes().contains( layer->geometryType() ); }
static QString factoryDescription() { return tr( "Duplicate" ); }
static QString factoryId();
static QgsGeometryCheck::CheckType factoryCheckType();

enum ResolutionMethod { NoChange, RemoveDuplicates };
};

Expand Down

0 comments on commit 97a9659

Please sign in to comment.