Commit e7ebeee8 authored by Olivier Gonzalez's avatar Olivier Gonzalez

Resolve CE to EE merge conflicts on documentation

parent 3870d7b3
......@@ -47,11 +47,7 @@ There's also a collection of repositories with [example projects](https://gitlab
## Static Application Security Testing (SAST)
<<<<<<< HEAD
**(Ultimate)** [Scan your code for vulnerabilities](sast.md)
=======
**(Ultimate)** [Scan your code for vulnerabilities](https://docs.gitlab.com/ee/ci/examples/sast.html)
>>>>>>> upstream/master
## Container Scanning
......
<<<<<<< HEAD
This document was moved to [another location](./container_scanning.md).
=======
This document was moved to [another location](./container_scanning.md).
>>>>>>> upstream/master
......@@ -228,11 +228,7 @@ created, it's uploaded as an artifact which you can later download and
check out.
In GitLab Ultimate, any security warnings are also
<<<<<<< HEAD
[shown in the merge request widget](../../user/project/merge_requests/container_scanning.md).
=======
[shown in the merge request widget](https://docs.gitlab.com/ee/user/project/merge_requests/container_scanning.html).
>>>>>>> upstream/master
### Auto Review Apps
......
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