Fixing merge issue and updating release number

This commit is contained in:
azhebel
2015-08-28 12:55:39 +03:00
parent f2b33773b6
commit a2b966fa24
2 changed files with 1 additions and 3 deletions

View File

@@ -1447,8 +1447,6 @@ Changelog
* Fixed bug 1279502: --version-check behaves like spyware
=======
>>>>>>> MERGE-SOURCE
v2.2.6 released 2013-12-18
==========================