Skip to content

G
gitlab-ce
Commit 08d5284b authored by Stan Hu's avatar Stan Hu
Browse files
Options

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

parent 5713e2b4
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 2 deletions
doc/user/admin_area/settings/visibility_and_access_controls.md
View file @ 08d5284b
...@@ -41,7 +41,6 @@ _Only SSH_ was selected. ...@@ -41,7 +41,6 @@ _Only SSH_ was selected.
block access to the server itself. The ports used for the protocol, be it SSH or block access to the server itself. The ports used for the protocol, be it SSH or
HTTP, will still be accessible. What GitLab does is restrict access on the HTTP, will still be accessible. What GitLab does is restrict access on the
application level. application level.
<<<<<<< HEAD
## Allow mirrors to be setup for projects ## Allow mirrors to be setup for projects
...@@ -55,4 +54,3 @@ work in every repository and can only be re-enabled on a per-project basis by an ...@@ -55,4 +54,3 @@ work in every repository and can only be re-enabled on a per-project basis by an
[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 [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
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