Update history to reflect merge of #6801 [ci skip]

2018-02-27 17:29:07 -05:00 · 2018-02-27 17:29:07 -05:00 · d2a21fe776
parent ed20cb4f90
commit d2a21fe776
1 changed files with 1 additions and 0 deletions
--- a/History.markdown
+++ b/History.markdown
@ -16,6 +16,7 @@
  * Cache the list of documents to be written (#6741)
  * Allow Jekyll Doctor to detect stray posts dir (#6681)
  * Excerpt relative-path should match its path (#6597)
+  * Remind user to resolve conflict in `jekyll new` with `--force` (#6801)

 ### Documentation