Resolve conflicts in app/controllers/projects_controller.rb

Resolve conflicts for https://gitlab.com/gitlab-org/gitlab-ee/merge_requests/8634

app/controllers/projects_controller.rb

@@ -6,12 +6,9 @@ class ProjectsController < Projects::ApplicationController
   include ExtractsPath
   include PreviewMarkdown
   include SendFileUpload
-<<<<<<< HEAD
-=======
 
   prepend_before_action(only: [:show]) { authenticate_sessionless_user!(:rss) }
 
->>>>>>> upstream/master
   before_action :whitelist_query_limiting, only: [:create]
   before_action :authenticate_user!, except: [:index, :show, :activity, :refs]
   before_action :redirect_git_extension, only: [:show]