diff options
| author | Chirayu Chiripal <chirayu.chiripal@gmail.com> | 2015-05-31 16:24:02 +0300 |
|---|---|---|
| committer | Chirayu Chiripal <chirayu.chiripal@gmail.com> | 2015-05-31 16:24:02 +0300 |
| commit | 90520707077fdaef872c3444b1eec1f17bd85b2a (patch) | |
| tree | a60251cccb3051d1d793f47cbdb8f6aa9e5eeeed /composer.json | |
| parent | 927969508ea23f2c866d1d29c88417a677523a20 (diff) | |
| parent | 22e52bd0af55931150eb999f8be6c9cf8f46842d (diff) | |
Merge commit '22e52bd'
Conflicts:
composer.json
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/composer.json b/composer.json index fda61cd0d7..e5c79ed78c 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,6 @@ "require-dev": { "satooshi/php-coveralls": ">=0.6", "phpunit/phpunit": ">=3.7", - "phpunit/phpunit-selenium": ">=1.2", - "scrutinizer/ocular": ">=1.0.0" + "phpunit/phpunit-selenium": ">=1.2" } } |