Fix merge conflicts

This commit is contained in:
Tuan Dang
2022-12-21 11:36:47 -05:00
134 changed files with 5155 additions and 1488 deletions
+1 -1
View File
@@ -11,7 +11,7 @@ export interface IUser {
tag?: string;
salt?: string;
verifier?: string;
refreshVersion?: Number;
refreshVersion?: number;
}
const userSchema = new Schema<IUser>(