# Conflicts:
#	app/web/page/activity/view/activity/index.ts
#	app/web/page/store/modules/activity/index.ts
#	app/web/page/store/modules/activity/type.ts
#	package-lock.json