Skip to content
Permalink
Browse files

fix bad backport

  • Loading branch information
elpaso committed Nov 13, 2020
1 parent 3a491c2 commit 6c9acd435cecdbff61c804b94cddb9b34fe52574
Showing with 0 additions and 4 deletions.
  1. +0 −4 src/gui/qgsdoublevalidator.h
@@ -67,12 +67,8 @@ class GUI_EXPORT QgsDoubleValidator : public QRegularExpressionValidator
*
* \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)
*/
QgsDoubleValidator( double bottom, double top, int decimal, QObject *parent );

0 comments on commit 6c9acd4

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