Resolve conflict in app/helpers/dropdowns_helper.rb

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

app/helpers/dropdowns_helper.rb

@@ -52,16 +52,12 @@ module DropdownsHelper
     end
   end
 
-<<<<<<< HEAD
   def dropdown_toggle_link(toggle_text, data_attr, options = {})
     output = content_tag(:a, toggle_text, class: "dropdown-toggle-text #{options[:toggle_class] if options.key?(:toggle_class)}", id: (options[:id] if options.key?(:id)), data: data_attr)
     output.html_safe
   end
 
-  def dropdown_title(title, back: false)
-=======
   def dropdown_title(title, options: {})
->>>>>>> upstream/master
     content_tag :div, class: "dropdown-title" do
       title_output = ""