From d2a21fe776630b8974f070fdf421f33b558b805e Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Tue, 27 Feb 2018 17:29:07 -0500
Subject: [PATCH] Update history to reflect merge of #6801 [ci skip]

---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 45fbb602..afa922df 100644
--- 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