# Conflicts:
#	src/components/passport/passport.scss
#	src/components/passport/setPassword/index.js
#	src/components/passport/setPassword/set-password.scss
#	src/router/router-config.js