#91209JavaSpec of 9.5 nightly builds has a merge conflict
Description
The backport of #91058 into 9.5 went wrong. The sources contain an unresolved merge conflict accidentally marked as “resolved”.
The backport of #91058 into 9.5 went wrong. The sources contain an unresolved merge conflict accidentally marked as “resolved”.