Resolve conflict in doc/user/group/index.md

dd989f2e · Marin Jankovski · 717ebf51 · dd989f2e
Commit dd989f2e authored Feb 06, 2018 by Marin Jankovski
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 5 deletions

doc/user/group/index.md doc/user/group/index.md +2 -5

No files found.
--- a/doc/user/group/index.md
+++ b/doc/user/group/index.md
@@ -179,7 +179,6 @@ Alternatively, you can [lock the sharing with group feature](#share-with-group-l
 In GitLab Enterprise Edition it is possible to manage GitLab group memberships using LDAP groups.
 See [the GitLab Enterprise Edition documentation](../../integration/ldap.md) for more information.

-<<<<<<< HEAD
 ## Epics

 > Introduced in [GitLab Enterprise Edition Ultimate][ee] 10.2.
@@ -190,8 +189,6 @@ milestones.

 [Learn more about Epics.](epics/index.md)

-=======
->>>>>>> upstream/master
 ## Transfer groups to another group

 From 10.5 there are two different ways to transfer a group: