UpdateType(mongoose): resolve merge branch conflicts

This commit is contained in:
mernxl
2018-08-30 13:28:56 +01:00
parent 459a5f8cf3
commit e62fd8963a
+4 -4
View File
@@ -976,10 +976,10 @@ declare module "mongoose" {
*/
validate?: RegExp | [RegExp, string] |
SchemaTypeOpts.ValidateFn<T> | [SchemaTypeOpts.ValidateFn<T>, string] |
SchemaTypeOpts.ValidateOpts | SchemaTypeOpts.ValidateOpts[] |
SchemaTypeOpts.AsyncValidateOpts | SchemaTypeOpts.AsyncValidateOpts[] |
SchemaTypeOpts.AsyncPromiseValidationFn<T> | SchemaTypeOpts.AsyncPromiseValidationFn<T>[] |
SchemaTypeOpts.AsyncPromiseValidationOpts | SchemaTypeOpts.AsyncPromiseValidationOpts[];
SchemaTypeOpts.ValidateOpts | SchemaTypeOpts.AsyncValidateOpts |
SchemaTypeOpts.AsyncPromiseValidationFn<T> | SchemaTypeOpts.AsyncPromiseValidationOpts |
(SchemaTypeOpts.ValidateOpts | SchemaTypeOpts.AsyncValidateOpts |
SchemaTypeOpts.AsyncPromiseValidationFn<T> | SchemaTypeOpts.AsyncPromiseValidationOpts)[];
/** Declares an unique index. */
unique?: boolean | any;