Generic/DisallowShortOpenTag: prevent fixer conflict#835

jrfnl merged 2 commits intomasterPHPCSStandards/PHP_CodeSniffer:masterfrom

feature/generic-disallowshortopentag-dont-act-on-parse-errorPHPCSStandards/PHP_CodeSniffer:feature/generic-disallowshortopentag-dont-act-on-parse-errorCopy head branch name to clipboard