# Conflicts: # public/modules/users/config/users.client.routes.js # public/modules/users/controllers/settings.client.controller.js # public/modules/users/views/settings/change-password.client.view.html
# Conflicts: # public/modules/users/config/users.client.routes.js # public/modules/users/controllers/settings.client.controller.js # public/modules/users/views/settings/change-password.client.view.html