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

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

@@ -6,10 +6,7 @@
 
 - content_for :page_specific_javascripts do
   = webpack_bundle_tag 'common_vue'
-<<<<<<< HEAD
   = webpack_bundle_tag 'issues'
-=======
->>>>>>> upstream/master
 
 = content_for :meta_tags do
   = auto_discovery_link_tag(:atom, params.merge(rss_url_options), title: "#{@project.name} issues")