Fix conflicts for Fix Markdown typo in Web IDE docs (!18502) · Merge requests · GitLab.org / GitLab FOSS · GitLab

Filipa Lacerda requested to merge 10-7-stable-patch-1-fix-18443 into 10-7-stable-patch-1 Apr 20, 2018

Fix conflict when cherry-picking https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18443 into 10-7-stable-patch-1