recreated definitions

Author: mtrezza

src/Options/Definitions.js

@@ -746,26 +746,14 @@ module.exports.PasswordPolicyOptions = {
   resetTokenReuseIfValid: {
     env: 'PARSE_SERVER_PASSWORD_POLICY_RESET_TOKEN_REUSE_IF_VALID',
     help:
-<<<<<<< HEAD
-<<<<<<< HEAD
       'Set to `true` if a password reset token should be reused in case another token is requested but there is a token that is still valid, i.e. has not expired. This avoids the often observed issue that a user requests multiple emails and does not know which link contains a valid token because each newly generated token would invalidate the previous token.<br><br>Default is `false`.',
-=======
-      'Reuse password reset token if it has not expired; requires `resetTokenValidityDuration` to be set. Default is `false`.',
->>>>>>> improved resetTokenReuseIfValid docs
-=======
-      'Is true if the password reset token should be reused if it has not expired; requires `resetTokenValidityDuration` to be set. Default is `false`.',
->>>>>>> improved resetTokenValidityDuration docs
     action: parsers.booleanParser,
     default: false,
   },
   resetTokenValidityDuration: {
     env: 'PARSE_SERVER_PASSWORD_POLICY_RESET_TOKEN_VALIDITY_DURATION',
     help:
-<<<<<<< HEAD
       'Set the validity duration of the password reset token in seconds after which the token expires. The token is used in the link that is set in the email. After the token expires, the link becomes invalid and a new link has to be sent. If the option is not set or set to `undefined`, then the token never expires.<br><br>For example, to expire the token after 2 hours, set a value of 7200 seconds (= 60 seconds * 60 minutes * 2 hours).<br><br>Default is `undefined`.',
-=======
-      'The time duration in seconds after which a password reset token expires and becomes invalid. Default is indefinite (never expires).',
->>>>>>> improved resetTokenValidityDuration docs
     action: parsers.numberParser('resetTokenValidityDuration'),
   },
   validationError: {

src/Options/docs.js

@@ -173,7 +173,6 @@
 
 /**
  * @interface PasswordPolicyOptions
-<<<<<<< HEAD
  * @property {Boolean} doNotAllowUsername Set to `true` to disallow the username as part of the password.<br><br>Default is `false`.
  * @property {Number} maxPasswordAge Set the number of days after which a password expires. Login attempts fail if the user does not reset the password before expiration.
  * @property {Number} maxPasswordHistory Set the number of previous password that will not be allowed to be set as new password. If the option is not set or set to `0`, no previous passwords will be considered.<br><br>Valid values are >= `0` and <= `20`.<br>Default is `0`.
@@ -182,15 +181,6 @@
  * @property {String} validationError Set the error message to be sent.<br><br>Default is `Password does not meet the Password Policy requirements.`
  * @property {Function} validatorCallback Set a callback function to validate a password to be accepted.<br><br>If used in combination with `validatorPattern`, the password must pass both to be accepted.
  * @property {String} validatorPattern Set the regular expression validation pattern a password must match to be accepted.<br><br>If used in combination with `validatorCallback`, the password must pass both to be accepted.
-=======
- * @property {Boolean} doNotAllowUsername disallow username in passwords
- * @property {Number} maxPasswordAge days for password expiry
- * @property {Number} maxPasswordHistory setting to prevent reuse of previous n passwords
- * @property {Boolean} resetTokenReuseIfValid Is true if the password reset token should be reused if it has not expired; requires `resetTokenValidityDuration` to be set. Default is `false`.
- * @property {Number} resetTokenValidityDuration The time duration in seconds after which a password reset token expires and becomes invalid. Default is indefinite (never expires).
- * @property {Function} validatorCallback a callback function to be invoked to validate the password
- * @property {String} validatorPattern a RegExp object or a regex string representing the pattern to enforce
->>>>>>> improved resetTokenReuseIfValid docs
  */
 
 /**