From f45b597e6139aedbf94f98de70479972300c419f Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Fri, 25 Apr 2014 23:07:04 -0400
Subject: [PATCH] Update history to reflect merge of #2238 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index ac95faad..99942d38 100644
--- a/History.markdown
+++ b/History.markdown
@@ -94,6 +94,7 @@
   * Strip newlines from the `{% highlight %}` block content (#1823)
   * Load in `rouge` only when it's been requested as the highlighter (#2189)
   * Convert input to string before XML escaping (`xml_escape` liquid filter) (#2244)
+  * Modify configuration key for Collections and reset properly. (#2238)
 
 ### Development Fixes
   * Add a link to the site in the README.md file (#1795)