From b5201c50ff819f315d823602eb1136a7f79ff14d Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Sun, 16 Aug 2020 06:48:22 -0400
Subject: [PATCH] Update history to reflect merge of #8342 [ci skip]

---
 History.markdown | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/History.markdown b/History.markdown
index eca310c1..8393ff2d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -25,6 +25,10 @@
 
   * Replace nested conditional with guard clauses (#8294)
 
+### Minor Enhancements
+
+  * Warn on command-line with permalink conflict (#8342)
+
 ## 4.1.1 / 2020-06-24
 
   * Fix grammar in documentation section (#8265)
@@ -222,8 +226,8 @@
 
 ### Minor Enhancements
 
-* Allow use of kramdown v2 (#8322)
-* Add default language for kramdown syntax highlighting (#8325)
+  * Allow use of kramdown v2 (#8322)
+  * Add default language for kramdown syntax highlighting (#8325)
 
 ## 3.8.7 / 2020-05-08