Update Changelog with strptime fix

10 years ago · 2f360ce447
parent 38641e741a
commit 2f360ce447
1 changed files with 1 additions and 4 deletions
--- a/5
+++ b/5
@ -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`.