# Conflicts:
#	dist/css/chunk-0f261c02.04f99a59.css
#	dist/css/chunk-0f261c02.3f8d4acd.css
#	dist/css/chunk-2274c8a2.3f8d4acd.css
#	dist/index.html
#	dist/js/chunk-04a36950.689398e4.js
#	dist/js/chunk-04a36950.71592e67.js
#	dist/js/chunk-04a36950.9a9993e4.js
#	dist/js/chunk-0f261c02.70b04603.js
#	dist/js/chunk-0f261c02.ec5c078c.js
#	dist/js/chunk-11e14712.699cd6d0.js
#	dist/js/chunk-2274c8a2.85e1bc5b.js
#	dist/js/chunk-24c062c7.35d5a017.js
#	dist/js/chunk-24c062c7.6b8fb36a.js
#	dist/js/chunk-24c062c7.7099430e.js
#	dist/js/chunk-2d210fe9.568e3f3e.js
#	dist/js/chunk-2d210fe9.de06466d.js
#	dist/js/chunk-2d210fe9.eb1ae400.js
#	dist/js/chunk-3c8e61f9.1e4da81d.js
#	dist/js/chunk-3c8e61f9.1fa5308f.js
#	dist/js/chunk-3c8e61f9.cc23d89a.js
#	dist/js/chunk-4ab6a8e6.70e7db28.js
#	dist/js/chunk-4ab6a8e6.8b3116ec.js
#	dist/js/chunk-4ab6a8e6.8eb219e2.js
#	dist/js/chunk-5186a57c.0e58007c.js
#	dist/js/chunk-5186a57c.431e08c6.js
#	dist/js/chunk-5186a57c.5f845fba.js
#	dist/js/chunk-63502675.2a681382.js
#	dist/js/chunk-63502675.e8967f75.js
#	dist/js/chunk-63502675.f955f59f.js
#	dist/js/chunk-74ea1fe8.14dd6a2a.js
#	dist/js/chunk-74ea1fe8.3603be85.js
#	dist/js/chunk-74ea1fe8.3a527184.js

* feature/3-2迭代:
  权限配置

* feature/3-2迭代:
  节日管理- 分类筛选条件

* feature/3-2迭代:
  节日 新增编辑

* feature/3-2迭代:
  分类 提示文案

* feature/3-2迭代:
  UI优化
  no message

# Conflicts:
#	src/views/activity/component/holiday-category-dialog.vue
#	src/views/activity/component/holiday-dialog.vue