Resolving composer.lock merge conflicts

composer update --lock fixes lock file when merging branches with .lock conflicts.


Revision #1
Created 8 April 2021 08:57:07 by Sander
Updated 8 April 2021 08:57:28 by Sander