docs(fix): 修改冲突

luoxue-victor · Dec 13, 2019 · 40e2b8b · 40e2b8b
2 parents c9b2f66 + 6e4c579
commit 40e2b8b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -84,6 +84,7 @@
  readme | 折叠扩展配置 | [8bea7ea](https://github.com/luoxue-victor/learn_webpack/commit/8bea7ea)
  stylelint | 课时11的文档完善 | [4a55f80](https://github.com/luoxue-victor/learn_webpack/commit/4a55f80)
  version | v1.0.5 | [c2b5932](https://github.com/luoxue-victor/learn_webpack/commit/c2b5932)
+ webpack5 | 更新 webpack5 文档 | [c9b2f66](https://github.com/luoxue-victor/learn_webpack/commit/c9b2f66)
 
 
 范围|描述|commitId