Commit 5713e2b4 authored by Stan Hu's avatar Stan Hu

Resolve conflicts in doc/user/admin_area/settings/visibility_and_access_controls.md

parent 0b1ec5c0
...@@ -53,9 +53,6 @@ work in every repository and can only be re-enabled on a per-project basis by an ...@@ -53,9 +53,6 @@ work in every repository and can only be re-enabled on a per-project basis by an
![Mirror settings](img/mirror_settings.png) ![Mirror settings](img/mirror_settings.png)
[ce-4696]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4696 [ce-4696]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4696
[ce-18021]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18021
[ee-3586]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3586 [ee-3586]: https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/3586
=======
[ce-4696]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/4696
>>>>>>> upstream/master
[ce-18021]: https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/18021
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