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

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('abcdefg', 'https://gitlab.com/gitlab-org/gitlab-ee/commits/abcdefg')
-=======
-      expect(rendered).to have_link('abcdefg', href: 'https://gitlab.com/gitlab-org/gitlab-ce/commits/abcdefg')
->>>>>>> upstream/master
+      expect(rendered).to have_link('abcdefg', href: 'https://gitlab.com/gitlab-org/gitlab-ee/commits/abcdefg')
     end
   end