Update app/helpers/button_helper.rb

app/helpers/button_helper.rb

@@ -92,7 +92,6 @@ module ButtonHelper
       class: "#{title.downcase}-selector",
       href: (href if href),
       data: (data if data)
-<<<<<<< HEAD
   end
 
   def kerberos_clone_button(project)
@@ -118,7 +117,5 @@ module ButtonHelper
                 data: data,
                 type: :button,
                 title: 'See Geo-specific instructions'
-=======
->>>>>>> upstream/master
   end
 end