From 2f360ce44724a570f18e20b79f528e1ea947606e Mon Sep 17 00:00:00 2001
From: Lee Clemens <droid@lc-cs.com>
Date: Sat, 3 Jan 2015 15:26:34 -0500
Subject: [PATCH] Update Changelog with strptime fix

---
 ChangeLog | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7e686adb4..040ff48cc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21,11 +21,8 @@ ver. 0.9.2 (2014/XX/XXX) - wanna-be-released
    * filters.d/exim.conf - cover different settings of exim logs
      details. Thanks bes.internal
    * filter.d/postfix-sasl.conf - failregex is now case insensitive
-<<<<<<< HEAD
-   * fail2ban/__init__.py - Added strptime thread safety hack-around
-=======
    * filters.d/postfix.conf - add 'Client host rejected error message' failregex
->>>>>>> 8fc32bb33f6f8c43fa107f1a6fc3a71bf000a767
+   * fail2ban/__init__.py - Added strptime thread safety hack-around
 
 - New Features:
    - New interpolation feature for config readers - `%(known/parameter)s`.