merged branch vierbergenlars/patch-1 (PR #4311)

fabpot · fabpot · commit 1e15f2109633 · 2012-05-18T09:43:09.000+02:00
Commits ------- fa705db Fix trailing comma in composer (closes #4310) Discussion ---------- Fix trailing comma in composer (bug #4310) This pull request fixes bug #4310 --------------------------------------------------------------------------- by travisbot at 2012-05-17T19:10:37Z This pull request [passes](http://travis-ci.org/symfony/symfony/builds/1359128) (merged fa705db into e351c9f).
diff --git a/src/Symfony/Component/Validator/composer.json b/src/Symfony/Component/Validator/composer.json
@@ -16,7 +16,7 @@
         }
     ],
     "require": {
-        "php": ">=5.3.3",
+        "php": ">=5.3.3"
     },
     "require-dev": {
         "symfony/http-foundation": "2.1.*",

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`}`
`17`	`17`	`],`
`18`	`18`	`"require": {`
`19`		`- "php": ">=5.3.3",`
	`19`	`+ "php": ">=5.3.3"`
`20`	`20`	`},`
`21`	`21`	`"require-dev": {`
`22`	`22`	`"symfony/http-foundation": "2.1.*",`