Skip to content

G
gitlab-ce
Commit 1234a748 authored by Achilleas Pipinellis's avatar Achilleas Pipinellis
Browse files
Options

Resolve docs conflicts

parent c047a29c
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
doc/ci/examples/dast.md
View file @ 1234a748
...@@ -35,10 +35,6 @@ Starting with [GitLab Enterprise Edition Ultimate][ee] 10.4, this information wi ...@@ -35,10 +35,6 @@ Starting with [GitLab Enterprise Edition Ultimate][ee] 10.4, this information wi
be automatically extracted and shown right in the merge request widget. To do be automatically extracted and shown right in the merge request widget. To do
so, the CI job must be named `dast` and the artifact path must be so, the CI job must be named `dast` and the artifact path must be
`gl-dast-report.json`. `gl-dast-report.json`.
<<<<<<< HEAD
[Learn more about DAST results shown in merge requests](../../user/project/merge_requests/dast.md). [Learn more about DAST results shown in merge requests](../../user/project/merge_requests/dast.md).
=======
[Learn more about DAST results shown in merge requests](https://docs.gitlab.com/ee/user/project/merge_requests/dast.html).
>>>>>>> upstream/master
[ee]: https://about.gitlab.com/gitlab-ee/ [ee]: https://about.gitlab.com/gitlab-ee/
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