fixed bad merge

DavertMik · DavertMik · commit 8d80bb4ec747 · 2016-06-29T03:59:28.000+03:00
diff --git a/composer.json b/composer.json
@@ -20,7 +20,8 @@
         "ext-mbstring": "*",
         "phpunit/phpunit": ">4.8.20 <5.5",
         "phpunit/php-code-coverage": ">=2.1.3",
-
+        "facebook/webdriver": ">=1.0.1 <2.0",
+        "guzzlehttp/guzzle": ">=4.1.4 <7.0",
         "guzzlehttp/psr7": "~1.0",
         "symfony/finder": ">=2.7 <4.0",
         "symfony/console": ">=2.7 <4.0",
diff --git a/src/Codeception/Codecept.php b/src/Codeception/Codecept.php
@@ -7,7 +7,7 @@
 
 class Codecept
 {
-    const VERSION = "2.2.3";
+    const VERSION = "2.2.2";
 
     /**
      * @var \Codeception\PHPUnit\Runner

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`
`8`	`8`	`class Codecept`
`9`	`9`	`{`
`10`		`- const VERSION = "2.2.3";`
	`10`	`+ const VERSION = "2.2.2";`
`11`	`11`
`12`	`12`	`/**`
`13`	`13`	`* @var \Codeception\PHPUnit\Runner`