Resolve conflict in app/views/projects/issues/_nav_btns.html.haml

app/views/projects/issues/_nav_btns.html.haml

-<<<<<<< HEAD
 - show_rss_button = local_assigns.fetch(:show_rss_button, true)
 - show_export_button = local_assigns.fetch(:show_export_button, true)
 
@@ -10,9 +9,6 @@
 
 - if show_export_button
   = render 'projects/issues/export_issues/button'
-=======
-= render 'shared/issuable/feed_buttons'
->>>>>>> upstream/master
 
 - if @can_bulk_update
   = button_tag "Edit issues", class: "btn btn-default append-right-10 js-bulk-update-toggle"