# Conflicts:
#	.roadhogrc.js
#	package.json
#	src/models/domain.js
#	src/models/main/index.js
#	src/router.js
#	src/routes/domain/index.js
#	src/routes/main/header.js

更新到最新的脚手架

# Conflicts:
#	.gitignore
#	.roadhogrc.js
#	src/models/domain.js
#	src/models/login.js
#	src/models/main/index.js
#	src/router.js

2. make eslint happy.