Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
6d278438
Commit
6d278438
authored
Jan 15, 2018
by
Marcia Ramos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix conflict in doc/ci/examples/README.md
parent
975b32b1
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
4 deletions
+0
-4
doc/ci/examples/README.md
doc/ci/examples/README.md
+0
-4
No files found.
doc/ci/examples/README.md
View file @
6d278438
...
...
@@ -43,11 +43,7 @@ There's also a collection of repositories with [example projects](https://gitlab
### Static Application Security Testing (SAST)
<<<<<<< HEAD
-
**(EEU)**
[
Scan your code for vulnerabilities
](
sast.md
)
=======
-
**(EEU)**
[
Scan your code for vulnerabilities
](
https://docs.gitlab.com/ee/ci/examples/sast.html
)
>>>>>>> upstream/master
-
[
Scan your Docker images for vulnerabilities
](
sast_docker.md
)
### Dynamic Application Security Testing (DAST)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment