Remove merge conflict line from script
Code
Review changes
Check out branch
Open in Workspace
Download
Patches
Plain diff
Expand sidebar
Remove merge conflict line from script
Evan Read
requested to merge
eread/remove-merge-conflict-line
into
master
Jul 22, 2020
Overview
0
Commits
1
Pipelines
0
Changes
1
Removes a line left in the script from:
!932 (merged)
, which causes jobs to fail in:
https://gitlab.com/gitlab-org/gitlab-docs/-/jobs/651275868
https://gitlab.com/gitlab-org/gitlab-docs/-/jobs/651275615
https://gitlab.com/gitlab-org/gitlab-docs/-/jobs/651286909
https://gitlab.com/gitlab-org/gitlab-docs/-/jobs/651289172
Merge request reports
Loading