From 506e066410052c42da36c237b8ba3c661448c86b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrien=20Verg=C3=A9?= <adrienverge@gmail.com>
Date: Fri, 6 Apr 2018 11:11:32 +0200
Subject: [PATCH] yamllint version 1.11.1

---
 CHANGELOG.rst        | 9 +++++++++
 yamllint/__init__.py | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 1127c82..71f522e 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -1,6 +1,15 @@
 Changelog
 =========
 
+1.11.1 (2018-04-06)
+-------------------
+
+- Handle merge keys (`<<`) in the `key-duplicates` rule
+- Update documentation about pre-commit
+- Make examples for `ignore` rule clearer
+- Clarify documentation on the 'truthy' rule
+- Fix crash in parser due to a change in PyYAML > 3.12
+
 1.11.0 (2018-02-21)
 -------------------
 
diff --git a/yamllint/__init__.py b/yamllint/__init__.py
index f86c4ea..e864758 100644
--- a/yamllint/__init__.py
+++ b/yamllint/__init__.py
@@ -22,7 +22,7 @@ indentation, etc."""
 
 
 APP_NAME = 'yamllint'
-APP_VERSION = '1.11.0'
+APP_VERSION = '1.11.1'
 APP_DESCRIPTION = __doc__
 
 __author__ = u'Adrien Vergé'