From 8e1b9fcdf59f4ea357fe114d723eb5a08012c9fe Mon Sep 17 00:00:00 2001
From: Jordon Bedwell <jordon@envygeeks.io>
Date: Sun, 1 Feb 2015 16:48:01 -0600
Subject: [PATCH] Update history to reflect merge of #3397 [ci skip]

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

diff --git a/History.markdown b/History.markdown
index 8a6512f6..5060462a 100644
--- a/History.markdown
+++ b/History.markdown
@@ -11,7 +11,6 @@
   * Move to Rouge as default highlighter (#3323)
 
 ### Minor Enhancements
-
   * Sort static files just once, and call `site_payload` once for all collections (#3204)
   * Separate `jekyll docs` and optimize external gem handling (#3241)
   * Improve `Site#getConverterImpl` and call it `Site#find_converter_instance` (#3240)
@@ -33,6 +32,7 @@
   * Show the regeneration time after the initial generation (#3378)
   * Site template: Switch default font to Helvetica Neue (#3376)
   * Make the `include` tag a teensy bit faster. (#3391)
+  * Add `pkill -f jekyll` to ways to kill. (#3397)
 
 ### Bug Fixes