From b89efa5d5d6a5f7284bf91370a8e759b99d17b5c Mon Sep 17 00:00:00 2001
From: jekyllbot <jekyllbot@jekyllrb.com>
Date: Tue, 15 May 2018 15:37:08 -0400
Subject: [PATCH] Update history to reflect merge of #7016 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 1333ff19..6ddf11c3 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,5 +1,9 @@
 ## HEAD
 
+### Development Fixes
+
+  * Update rubocop version (#7016)
+
 ### Bug Fixes
 
   * Add whitespace control to LIQUID_TAG_REGEX (#7015)