From bd3c395cfcca50e18d930c1a1135ef917b079751 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Fri, 24 Nov 2017 03:49:15 -0500
Subject: [PATCH] Update history to reflect merge of #6569 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index b9fb4843..94d3c9ec 100644
--- a/History.markdown
+++ b/History.markdown
@@ -91,6 +91,7 @@
   * Raise when theme root directory is not available (#6455)
   * Avoid block parser warning in SmartyPants (#6565)
   * Fail gracefully if &#34;sass&#34; gem cannot be loaded (#6573)
+  * return correct file in dir if dir has same name as file (#6569)
 
 ## 3.6.2 / 2017-10-21