Clean docs/jira.rst

Gonchik Tsymzhitov · Gonchik Tsymzhitov · commit 2f596c076796 · 2020-11-05T14:02:26.000+03:00
diff --git a/docs/jira.rst b/docs/jira.rst
@@ -207,13 +207,10 @@ Manage issues
     # Delete Issue Links
     jira.delete_issue_remote_link_by_id(issue_key, link_id)
 
-<<<<<<< HEAD
-=======
     # Export Issues to csv
     jira.csv(jql, all_fields=False)
 
 
->>>>>>> a0bfce195ff799e9616a34b131bdaadbb096ee9d
 Manage Boards
 -------------
 
