From a25fd7233435010ea75dd66485a0217548e0663f Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Wed, 22 Nov 2017 09:37:20 -0500
Subject: [PATCH] Update history to reflect merge of #5828 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 85ca98c6..ba659ed6 100644
--- a/History.markdown
+++ b/History.markdown
@@ -53,6 +53,7 @@
   * Dependencies: upgrade to toml 0.2.0 (#6541)
   * Lock to cucumber 3.0.1 on Ruby 2.1 (#6546)
   * Bump JRuby version in Travis config (#6561)
+  * Rescue from Psych::SyntaxError instead of SyntaxError after parsing YAML (#5828)
 
 ### Minor Enhancements