Fix merge conflicts

This commit is contained in:
Tuan Dang
2023-01-30 19:48:12 +07:00
167 changed files with 5540 additions and 1256 deletions
-7
View File
@@ -68,13 +68,6 @@ export default function PasswordReset() {
});
if (!errorCheck) {
// const { ciphertext, iv, tag } = Aes256Gcm.encrypt({
// text: privateKey,
// secret: newPassword
// .slice(0, 32)
// .padStart(32 + (newPassword.slice(0, 32).length - new Blob([newPassword]).size), '0')
// }) as { ciphertext: string; iv: string; tag: string };
client.init(
{
username: email,