Resolve conflict in app/assets/stylesheets/pages/issues.scss

Signed-off-by: Rémy Coutable <remy@rymai.me>

app/assets/stylesheets/pages/issues.scss

@@ -149,7 +149,6 @@ ul.related-merge-requests > li {
   }
 }
 
-<<<<<<< HEAD
 .issues-footer {
   padding-top: $gl-padding;
   padding-bottom: 37px;
@@ -170,10 +169,7 @@ ul.related-merge-requests > li {
   }
 }
 
-.issue-email-modal-btn {
-=======
 .issuable-email-modal-btn {
->>>>>>> upstream/master
   padding: 0;
   color: $gl-link-color;
   background-color: transparent;