fix conflict in doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md

e98621f0 · Marcia Ramos · b52ffc90 · e98621f0
Commit e98621f0 authored Dec 26, 2017 by Marcia Ramos
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 4 deletions

doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md ...inistration/auth/how_to_configure_ldap_gitlab_ce/index.md +0 -4

No files found.
--- a/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
+++ b/doc/administration/auth/how_to_configure_ldap_gitlab_ce/index.md
@@ -264,8 +264,4 @@ have extended functionalities with LDAP, such as:
 - Updating user permissions
 - Multiple LDAP servers

-<<<<<<< HEAD
 Read through the article on [LDAP for GitLab EE](../how_to_configure_ldap_gitlab_ee/index.md) for an overview.
-=======
-Read through the article on [LDAP for GitLab EE](https://docs.gitlab.com/ee/administration/auth/how_to_configure_ldap_gitlab_ee/) for an overview.
->>>>>>> upstream/master