Update file composer.json
Compare changes
Conflict: This file was added both in the source and target branches, but with different contents.
Ask someone with write access to resolve it.
composer.json
0 → 100644
+ 7
− 0