summaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorRemi Collet <remi@remirepo.net>2019-02-18 10:21:34 +0100
committerRemi Collet <remi@remirepo.net>2019-02-18 10:21:34 +0100
commit219f6284a2e77281ffedac0c3c0b3228c557a3bd (patch)
treeabb0ef2a0ec88bb8bd5a69f39e0c09cbb79e43ab /composer.json
parentf5b6163bcf6f5452dc6f8989804a3617b299ba92 (diff)
v2.14.2 (no change)
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json3
1 files changed, 0 insertions, 3 deletions
diff --git a/composer.json b/composer.json
index 004d8bd..30e749c 100644
--- a/composer.json
+++ b/composer.json
@@ -31,9 +31,6 @@
"symfony/process": "^3.0 || ^4.0",
"symfony/stopwatch": "^3.0 || ^4.0"
},
- "conflict": {
- "hhvm": "*"
- },
"require-dev": {
"johnkary/phpunit-speedtrap": "^1.1 || ^2.0 || ^3.0",
"justinrainbow/json-schema": "^5.0",