Merge pull request #10 from faouzic/feature/25012

[FEATURE#25012] Version Behat
etna-alternance · Apr 29, 2016 · 3e687b8 · 3e687b8
2 parents cd18112 + cbf7324
commit 3e687b8
Show file tree

Hide file tree

Showing 3 changed files with 2,068 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,3 @@
 bin/
 tmp/
 vendor/
-composer.lock
diff --git a/composer.json b/composer.json
@@ -12,7 +12,7 @@
     ],
     "require": {
         "php": ">=5.5",
-        "behat/behat": "~3.0.6",
+        "behat/behat": "3.x",
         "phpunit/php-code-coverage": "~2.0",
         "phpunit/phpcov": "~2.0",
         "guzzlehttp/guzzle": "~6.1",