Resolve conflicts for views/help/index.html.haml

app/views/help/index.html.haml

@@ -7,11 +7,7 @@
   GitLab
   Enterprise Edition
   - if user_signed_in?
-<<<<<<< HEAD
     %span= link_to Gitlab::VERSION, Gitlab::COM_URL + namespace_project_tag_path('gitlab-org', 'gitlab-ee', "v#{Gitlab::VERSION}")
-=======
-    %span= link_to Gitlab::VERSION, Gitlab::COM_URL + namespace_project_tag_path('gitlab-org', 'gitlab-ce', "v#{Gitlab::VERSION}")
->>>>>>> upstream/master
     = version_status_badge
   %hr
 

spec/views/help/index.html.haml_spec.rb

@@ -21,11 +21,7 @@ describe 'help/index' do
       render
 
       expect(rendered).to match '8.0.2'
-<<<<<<< HEAD
       expect(rendered).to have_link('8.0.2', href: 'https://gitlab.com/gitlab-org/gitlab-ee/tags/v8.0.2')
-=======
-      expect(rendered).to have_link('8.0.2', href: 'https://gitlab.com/gitlab-org/gitlab-ce/tags/v8.0.2')
->>>>>>> upstream/master
     end
   end