symfony / flex

Composer plugin for Symfony
MIT License
4.15k stars 181 forks source link

Fix a merge-conflict residue #1021

Closed heiglandreas closed 5 months ago

heiglandreas commented 5 months ago

Due to the merge-conflict marker the code could not be executed and failed CI

nicolas-grekas commented 5 months ago

Oops, thanks!