Fix cherry pick doc

1 files changed, 0 insertions, 12 deletions

diff --git a/doc/user/project/issues/issues_functionalities.md b/doc/user/project/issues/issues_functionalities.md
index 637aba56bfd..0a123de2fe8 100644
--- a/doc/user/project/issues/issues_functionalities.md
+++ b/doc/user/project/issues/issues_functionalities.md
@@ -41,7 +41,6 @@ it's reassigned to someone else to take it from there.
 if a user is not member of that project, it can only be
 assigned to them if they created the issue themselves.
 
-<<<<<<< HEAD
 ##### 3.1. Multiple Assignees (EES/EEP)
 
 Issue Weights are only available in [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/).
@@ -57,8 +56,6 @@ to an issue.
 Multiple Assignees was [introduced](https://gitlab.com/gitlab-org/gitlab-ee/issues/1904)
 in [GitLab Enterprise Edition 9.2](https://about.gitlab.com/2017/05/22/gitlab-9-2-released/#multiple-assignees-for-issues).
 
-=======
->>>>>>> 6386e42... Merge branch 'docs/new-topic-issues' into 'master'
 #### 4. Milestone
 
 - Select a [milestone](../milestones/index.md) to attribute that issue to.
@@ -171,17 +168,8 @@ Once you wrote your comment, you can either:
 - Click "Start discussion": start a thread within that issue's thread to discuss specific points.
 - Click "Comment and close issue": post your comment and close that issue in one click.
 
-<<<<<<< HEAD
-#### 18. New Merge Request
-
-- Create a new merge request (with a new source branch named after the issue) in one action.
-The merge request will automatically close that issue as soon as merged.
-- Optionally, you can just create a [new branch](../repository/web_editor.md#create-a-new-branch-from-an-issue)
-named after that issue.
-=======
 #### 18. New branch
 
 - [New branch](../repository/web_editor.md#create-a-new-branch-from-an-issue):
 create a new branch, followed by a new merge request which will automatically close that
 issue as soon as that merge request is merged.
->>>>>>> 6386e42... Merge branch 'docs/new-topic-issues' into 'master'