Fixed merge error

2015a57a · Bas de Nooijer · 6b745330 · 2015a57a
Commit 2015a57a authored Nov 04, 2014 by Bas de Nooijer
Show whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

composer.json composer.json +1 -1

No files found.
--- a/composer.json
+++ b/composer.json
@@ -18,7 +18,7 @@
    "require-dev": {
        "phpunit/phpunit": "~3.7",
        "squizlabs/php_codesniffer": "~1.4",
-        "zendframework/zendframework1": "~1.12"
+        "zendframework/zendframework1": "~1.12",
        "satooshi/php-coveralls": "~0.6"
    },
    "extra": {