Fix composer.json after merge

This commit is contained in:
Romain Neutron 2013-02-07 12:14:09 +01:00
commit c41b5879c5

View file

@ -33,10 +33,5 @@
"psr-0": { "psr-0": {
"FFMpeg": "src" "FFMpeg": "src"
} }
},
"extra": {
"branch-alias": {
"dev-master": "0.1.x-dev"
}
} }
} }