dan/ffmpeg-mappable-media
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix composer.json after merge

Browse source
This commit is contained in:
Romain Neutron 2013-02-07 12:14:09 +01:00
commit c41b5879c5
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
composer.json
View file

@ -22,7 +22,7 @@
"monolog/monolog" : "~1.0" "monolog/monolog" : "~1.0"
}, },
"suggest": { "suggest": {
"php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg" "php-ffmpeg/extras": "A compilation of common audio & video drivers for PHP-FFMpeg"
}, },
"require-dev": { "require-dev": {
"sami/sami" : "dev-master", "sami/sami" : "dev-master",
@ -33,10 +33,5 @@
"psr-0": { "psr-0": {
"FFMpeg": "src" "FFMpeg": "src"
} }
},
"extra": {
"branch-alias": {
"dev-master": "0.1.x-dev"
}
} }
} }