Skip to content

G
gitlab-ce
Commit 2a9c92bb authored by Marcia Ramos's avatar Marcia Ramos
Browse files
Options

fix conflict in doc/topics/autodevops/index.md

parent 7958a4c5
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
doc/topics/autodevops/index.md
View file @ 2a9c92bb
...@@ -214,11 +214,7 @@ report is created, it's uploaded as an artifact which you can later download and ...@@ -214,11 +214,7 @@ report is created, it's uploaded as an artifact which you can later download and
check out. check out.
In GitLab Enterprise Edition Ultimate, any security warnings are also In GitLab Enterprise Edition Ultimate, any security warnings are also
<<<<<<< HEAD
[shown in the merge request widget](../../user/project/merge_requests/sast.md). [shown in the merge request widget](../../user/project/merge_requests/sast.md).
=======
[shown in the merge request widget](https://docs.gitlab.com/ee/user/project/merge_requests/sast.html).
>>>>>>> upstream/master
### Auto SAST for Docker images ### Auto SAST for Docker images
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7