resolve conflicts

2025-12-17 22:57:21 +01:00 · 2016-03-13 10:45:19 -07:00
parent c14f0c4247 46322cfd38
commit c61b10a6eb
1 changed files with 0 additions and 1 deletions
--- a/website/src/controllers/api-v3/user.js
+++ b/website/src/controllers/api-v3/user.js
@@ -77,7 +77,6 @@ api.updatePassword = {

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