Fixed composer.json (merge error)

This commit is contained in:
Ingo Schommer 2013-06-02 20:38:13 +02:00
parent 6b8192e7bd
commit 26ec73fde8

View File

@ -9,7 +9,8 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "3.2.x-dev" "dev-master": "3.2.x-dev"
}
}, },
"scripts": { "scripts": {
"post-install-cmd": "php ./framework/cli-script.php dev/build", "post-install-cmd": "php ./framework/cli-script.php dev/build",