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

5713e2b4 · Stan Hu · 0b1ec5c0 · 5713e2b4
Commit 5713e2b4 authored Apr 05, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 4 deletions

doc/user/admin_area/settings/visibility_and_access_controls.md ...ser/admin_area/settings/visibility_and_access_controls.md +1 -4

No files found.
--- a/doc/user/admin_area/settings/visibility_and_access_controls.md
+++ b/doc/user/admin_area/settings/visibility_and_access_controls.md
@@ -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)
 [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
-=======
-[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