From a2b966fa240af5913f80df037c7f723ef004a3bb Mon Sep 17 00:00:00 2001
From: azhebel <alexey.zhebel@percona.com>
Date: Fri, 28 Aug 2015 12:55:39 +0300
Subject: [PATCH] Fixing merge issue and updating release number

---
 config/sphinx-build/conf.py | 2 +-
 docs/release_notes.rst      | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/config/sphinx-build/conf.py b/config/sphinx-build/conf.py
index 49bc56c7..6371e9b2 100644
--- a/config/sphinx-build/conf.py
+++ b/config/sphinx-build/conf.py
@@ -50,7 +50,7 @@ copyright = u'2015, Percona LLC and/or its affiliates'
 # The short X.Y version.
 version = '2.2'
 # The full version, including alpha/beta/rc tags.
-release = '2.2.14'
+release = '2.2.15'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/release_notes.rst b/docs/release_notes.rst
index b611c690..e4a3e569 100644
--- a/docs/release_notes.rst
+++ b/docs/release_notes.rst
@@ -1447,8 +1447,6 @@ Changelog
 
 * Fixed bug 1279502: --version-check behaves like spyware
 
-=======
->>>>>>> MERGE-SOURCE
 v2.2.6 released 2013-12-18
 ==========================