Fix composer.json after merge
This commit is contained in:
parent
2492a07705
commit
c41b5879c5
1 changed files with 1 additions and 6 deletions
|
|
@ -33,10 +33,5 @@
|
||||||
"psr-0": {
|
"psr-0": {
|
||||||
"FFMpeg": "src"
|
"FFMpeg": "src"
|
||||||
}
|
}
|
||||||
},
|
|
||||||
"extra": {
|
|
||||||
"branch-alias": {
|
|
||||||
"dev-master": "0.1.x-dev"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue