krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 07:07:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolve conflicts

Browse Source
This commit is contained in:
Victor Piousbox
2016-03-13 10:45:19 -07:00
parent c14f0c4247 46322cfd38
commit c61b10a6eb
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
website/src/controllers/api-v3/user.js
View File

@@ -77,7 +77,6 @@ api.updatePassword = {
user.auth.local.hashed_password = passwordUtils.encrypt(req.body.newPassword, user.auth.local.salt); // eslint-disable-line camelcase user.auth.local.hashed_password = passwordUtils.encrypt(req.body.newPassword, user.auth.local.salt); // eslint-disable-line camelcase
await user.save(); await user.save();
res.send(200, {}); res.send(200, {});
}, },
}; };