Reviewing merge request "clone-by-ertai" → "mainline"

[merged]

clone-by-ertai:edge has requested a merge with mainline:edge:

Remove an extra line added by a merge.