Skip to content

Commit

Permalink
Fix composer conflict.
Browse files Browse the repository at this point in the history
  • Loading branch information
hswong3i committed Jun 25, 2014
1 parent f58d794 commit b502643
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"doctrine/orm": "~2.2,>=2.2.3",
"fabpot/php-cs-fixer": "@stable",
"phpunit/phpunit": "4.1.*",
"sami/sami": "dev-master",
"sami/sami": "~1.4",
"satooshi/php-coveralls": "dev-master",
"silex/silex": "~1.2",
"symfony/browser-kit": ">=2.3,<2.6-dev",
Expand Down

0 comments on commit b502643

Please sign in to comment.