Commit f0d41de3 authored by Bob Van Landuyt's avatar Bob Van Landuyt

Resolve conflicts in `app/views/projects/issues/_nav_btns.html.haml`

parent 9f538d18
<<<<<<< HEAD
- show_rss_button = local_assigns.fetch(:show_rss_button, true) - show_rss_button = local_assigns.fetch(:show_rss_button, true)
- show_export_button = local_assigns.fetch(:show_export_button, true) - show_export_button = local_assigns.fetch(:show_export_button, true)
...@@ -9,10 +8,6 @@ ...@@ -9,10 +8,6 @@
- if show_export_button - if show_export_button
= render 'projects/issues/export_issues/button' = render 'projects/issues/export_issues/button'
=======
= link_to safe_params.merge(rss_url_options), class: 'btn btn-default append-right-10 has-tooltip', title: 'Subscribe' do
= icon('rss')
>>>>>>> upstream/master
- if @can_bulk_update - if @can_bulk_update
= button_tag "Edit issues", class: "btn btn-default append-right-10 js-bulk-update-toggle" = button_tag "Edit issues", class: "btn btn-default append-right-10 js-bulk-update-toggle"
- if show_new_issue_link?(@project) - if show_new_issue_link?(@project)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment