fix rebase issues

This commit is contained in:
Matthias Kuhn 2018-10-01 16:47:29 +02:00
parent a05e787d5a
commit 97a9659a83
No known key found for this signature in database
GPG Key ID: 7A7F1A1C90C3E6A7

View File

@ -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 };
};