Commit 815afb28 authored by Steve Azzopardi's avatar Steve Azzopardi

Resolve conflicts in doc/README.md

Resolve conflicts for
https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8634
parent c9f585a6
This diff is collapsed.
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