Fixed merge error

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": {