Resolve conflicts in doc/user/project/issues/create_new_issue.md

6b3de78d · Stan Hu · 5540e14b · 6b3de78d
Commit 6b3de78d authored Mar 02, 2018 by Stan Hu
Hide whitespace changes
Inline Side-by-side

Showing with 0 additions and 3 deletions

doc/user/project/issues/create_new_issue.md doc/user/project/issues/create_new_issue.md +0 -3

No files found.
--- a/doc/user/project/issues/create_new_issue.md
+++ b/doc/user/project/issues/create_new_issue.md
@@ -58,7 +58,6 @@ body becomes the issue description. [Markdown] and [quick actions] are
 supported.

 ![Bottom of a project issues page](img/new_issue_from_email.png)
-<<<<<<< HEAD

 ## New issue via Service Desk

@@ -85,5 +84,3 @@ create issues for the same project.

 [Markdown]: ../../markdown.md
 [quick actions]: ../quick_actions.md
-=======
->>>>>>> upstream/master