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

975b32b1 · Marcia Ramos · 2a9c92bb · 975b32b1
Commit 975b32b1 authored Jan 15, 2018 by Marcia Ramos
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 8 deletions

doc/topics/autodevops/index.md doc/topics/autodevops/index.md +0 -8

No files found.
--- a/doc/topics/autodevops/index.md
+++ b/doc/topics/autodevops/index.md
@@ -227,11 +227,7 @@ created, it's uploaded as an artifact which you can later download and
 check out.
 In GitLab Enterprise Edition Ultimate, any security warnings are also
-<<<<<<< HEAD
 [shown in the merge request widget](../../user/project/merge_requests/sast_docker.md).
-=======
-[shown in the merge request widget](https://docs.gitlab.com/ee/user/project/merge_requests/sast_docker.html).
->>>>>>> upstream/master
 ### Auto DAST
@@ -244,11 +240,7 @@ issues. Once the report is created, it's uploaded as an artifact which you can
 later download and check out.
 In GitLab Enterprise Edition Ultimate, any security warnings are also
-<<<<<<< HEAD
 [shown in the merge request widget](../../user/project/merge_requests/dast.md).
-=======
-[shown in the merge request widget](https://docs.gitlab.com/ee/user/project/merge_requests/dast.html).
->>>>>>> upstream/master
 ### Auto Browser Performance Testing