Fix conflict within PSR12.ControlStructures.ControlStructureSpacing#581

jrfnl merged 1 commit intoPHPCSStandards:masterPHPCSStandards/PHP_CodeSniffer:masterfrom

fredden:fixer-conflict/PSR12.ControlStructures.ControlStructureSpacingfredden/PHP_CodeSniffer:fixer-conflict/PSR12.ControlStructures.ControlStructureSpacingCopy head branch name to clipboard