fix conflict (issues documentation)

doc/intro/README.md

@@ -11,11 +11,7 @@ Create projects and groups.
 
 Create issues, labels, milestones, cast your vote, and review issues.
 
-<<<<<<< HEAD
 - [Create an issue](../user/project/issues/create_new_issue.md)
-=======
-- [Create a new issue](../user/project/issues/index.md#new-issue)
->>>>>>> upstream/master
 - [Assign labels to issues](../user/project/labels.md)
 - [Use milestones as an overview of your project's tracker](../user/project/milestones/index.md)
 - [Use voting to express your like/dislike to issues and merge requests](../workflow/award_emoji.md)

doc/user/project/issues/index.md

@@ -92,7 +92,6 @@ Find GitLab Issue Boards by navigating to your **Project's Dashboard** > **Issue
 Read through the documentation for [Issue Boards](../issue_board.md)
 to find out more about this feature.
 
-<<<<<<< HEAD
 #### Multiple Issue Boards (EES/EEP)
 
 Multiple Issue Boards enables you to create more than one Issue Board per project.
@@ -100,9 +99,6 @@ It's great for large projects with more than one team or in situations where a
 repository is used to host the code of multiple products.
 
 [Multiple Issue Boards](../issue_board.html#multiple-issue-boards)
-=======
-[Multiple Issue Boards](https://docs.gitlab.com/ee/user/project/issue_board.html#multiple-issue-boards)
->>>>>>> upstream/master
 are available only in [GitLab Enterprise Edition](https://about.gitlab.com/gitlab-ee/).
 
 ### Issue's API

doc/user/project/issues/issues_functionalities.md

@@ -52,11 +52,7 @@ This feature is available only in [GitLab Enterprise Edition](https://about.gitl
 > **Note:**
 both estimate and spend times are set via [GitLab Slash Commands](../slash_commands.md).
 
-<<<<<<< HEAD
 Learn more on the [Time Tracking documentation](../../../workflow/time_tracking.md).
-=======
-Learn more on the [Time Tracking documentation](https://docs.gitlab.com/ee/workflow/time_tracking.html).
->>>>>>> upstream/master
 
 #### 6. Due date
 
@@ -85,11 +81,7 @@ Issue Weights are only available in [GitLab Enterprise Edition](https://about.gi
 - Attribute a weight (in a 0 to 9 range) to that issue. Easy to complete
 should weight 1 and very hard to complete should weight 9.
 
-<<<<<<< HEAD
 Learn more on the [Issue Weight documentation](../../../workflow/issue_weight.md).
-=======
-Learn more on the [Issue Weight documentation](https://docs.gitlab.com/ee/workflow/issue_weight.html).
->>>>>>> upstream/master
 
 #### 9. Participants