From 828ee760c23f5f03399e2bb65d213ee04f3a4695 Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Thu, 3 Aug 2017 22:00:25 -0400
Subject: [PATCH] Update history to reflect merge of #6206 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index fe4aeb8d..4b298be6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -14,6 +14,7 @@
   * Add URL checks to Doctor (#5760)
   * Fix serving files that clash with directories (#6222) (#6231)
   * Bump supported Ruby version to `>= 2.1.0` (#6220)
+  * set `LiquidError#template_name` for errors in included file (#6206)
 
 ### Bug Fixes