fix bad backport

qgis · Nov 13, 2020 · e345bb3 · e345bb3
1 parent 6c9acd4
commit e345bb3
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/python/gui/auto_generated/qgsdoublevalidator.sip.in b/python/gui/auto_generated/qgsdoublevalidator.sip.in
@@ -52,12 +52,8 @@ Constructor for QgsDoubleValidator.
 
 :param bottom: the minimal range limit accepted by the validator
 :param top: the maximal range limit accepted by the validator
-<<<<<<< HEAD
-:param decimal: the number of decimal accepted by the validator
-=======
 :param decimal: the number of decimals accepted by the validator
 :param parent: parent object
->>>>>>> 3f11294dfd (Merge pull request #39778 from elpaso/bugfix-gh39757-shared-locale-sort)
 %End
 
     QgsDoubleValidator( int decimal, QObject *parent );