Resolve a few files

doc/integration/README.md

@@ -13,10 +13,7 @@ See the documentation below for details on how to configure these services.
 - [Gmail actions buttons](gmail_action_buttons_for_gitlab.md) Adds GitLab actions to messages
 - [Jenkins](jenkins.md) Integrate with the Jenkins CI
 - [JIRA](../user/project/integrations/jira.md) Integrate with the JIRA issue tracker
-<<<<<<< HEAD
 - [Kerberos](kerberos.md) Integrate with Kerberos
-=======
->>>>>>> upstream/master
 - [LDAP](ldap.md) Set up sign in via LDAP
 - [OAuth2 provider](oauth_provider.md) OAuth2 application creation
 - [OmniAuth](omniauth.md) Sign in via Twitter, GitHub, GitLab.com, Google, Bitbucket, Facebook, Shibboleth, SAML, Crowd, Azure and Authentiq ID

locale/gitlab.pot

@@ -987,8 +987,6 @@ msgstr ""
 msgid "Push Rules"
 msgstr ""
 
-<<<<<<< HEAD
-=======
 msgid "ProjectsDropdown|Loading projects"
 msgstr ""
 
@@ -1007,7 +1005,6 @@ msgstr ""
 msgid "ProjectsDropdown|This feature requires browser localStorage support"
 msgstr ""
 
->>>>>>> upstream/master
 msgid "Push events"
 msgstr ""
 

spec/controllers/projects/artifacts_controller_spec.rb

@@ -114,7 +114,6 @@ describe Projects::ArtifactsController do
         end
       end
     end
-<<<<<<< HEAD
 
     context 'when the file does not exist' do
       let(:path) { 'unknown' }
@@ -125,8 +124,6 @@ describe Projects::ArtifactsController do
         expect(response).to be_not_found
       end
     end
-=======
->>>>>>> upstream/master
   end
 
   describe 'GET latest_succeeded' do