From 9a66a1614e2f6352b19bb281722e6d2b161f7586 Mon Sep 17 00:00:00 2001
From: olivia hugger <olivia@fastmail.com>
Date: Wed, 7 Nov 2018 15:46:03 +0100
Subject: [PATCH] correct faulty merges

---
 History.markdown | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/History.markdown b/History.markdown
index 517ea368..30693b2d 100644
--- a/History.markdown
+++ b/History.markdown
@@ -1,10 +1,5 @@
 ## HEAD
 
-  * Textile is only supported through a converter plugin (#7003)
-  * Add info how to deploy using pre-push git hook (#7179)
-  * chore(release): reflect latest patched releases (#7262)
-  * Update posts.md (#7360)
-
 ### Documentation
 
   * Release post for v3.8.0 (#6849)
@@ -75,6 +70,9 @@
   * Document Jekyll Filters with YAML data (#7335)
   * Remove redundant instruction comment (#7342)
   * docs: minimize rendering count (#7343)
+  * Update posts.md (#7360)
+  * Add info how to deploy using pre-push git hook (#7179)
+  * Textile is only supported through a converter plugin (#7003)
 
 ### Minor Enhancements