From cb342c375dee00cb3b90872de55c3530173cbb53 Mon Sep 17 00:00:00 2001
From: Parker Moore <parkrmoore@gmail.com>
Date: Sun, 27 Dec 2015 08:27:37 -0500
Subject: [PATCH] Update history to reflect merge of #4289

[ci skip]
---
 History.markdown | 1 +
 1 file changed, 1 insertion(+)

diff --git a/History.markdown b/History.markdown
index 33bc0830..9a2b4aca 100644
--- a/History.markdown
+++ b/History.markdown
@@ -27,6 +27,7 @@
   * Avoid using `Dir.glob` with absolute path to allow special characters in the path (#4150)
   * Handle empty config files (#4052)
   * Rename `@options` so that it does not impact Liquid. (#4173)
+  * utils/drops: update Drop to support `Utils.deep_merge_hashes` (#4289)
 
 ### Development Fixes