Skip to content

Fix a merge conflict

Administrator requested to merge fix-merge-conflict into master

Created by: mrnugget

This popped up on master after merging https://github.com/sourcegraph/sourcegraph/pull/11306.

Merge request reports