Resolve _commit.html.haml conflicts

app/views/projects/commits/_commit.html.haml

@@ -13,13 +13,10 @@
                view_details,
                commit.status(ref),
                I18n.locale].compact
-<<<<<<< HEAD
 
 -# EE-only
 - show_project_name = local_assigns.fetch(:show_project_name, false)
 - cache_key << show_project_name
-=======
->>>>>>> upstream/master
 
 = cache(cache_key, expires_in: 1.day) do
   %li.commit.flex-row.js-toggle-container{ id: "commit-#{commit.short_id}" }