Fix some miscellaneous conflicts in app/ and lib/

app/controllers/projects_controller.rb

@@ -91,12 +91,8 @@ class ProjectsController < Projects::ApplicationController
   end
 
   def show
-<<<<<<< HEAD
     # If we're importing while we do have a repository, we're simply updating the mirror.
     if @project.import_in_progress? && !@project.updating_mirror?
-=======
-    if @project.import_in_progress?
->>>>>>> ce/master
       redirect_to project_import_path(@project)
       return
     end

app/policies/base_policy.rb

@@ -17,7 +17,6 @@ class BasePolicy < DeclarativePolicy::Base
   condition(:restricted_public_level, scope: :global) do
     current_application_settings.restricted_visibility_levels.include?(Gitlab::VisibilityLevel::PUBLIC)
   end
-<<<<<<< HEAD
 
   # EE Extensions
   with_scope :user
@@ -28,6 +27,4 @@ class BasePolicy < DeclarativePolicy::Base
 
   with_scope :global
   condition(:license_block) { License.block_changes? }
-=======
->>>>>>> ce/master
 end

lib/api/variables.rb

@@ -50,13 +50,10 @@ module API
       post ':id/variables' do
         variable_params = declared_params(include_missing: false)
 
-<<<<<<< HEAD
         # EE
         variable_params.delete(:environment_scope) unless
             user_project.feature_available?(:variable_environment_scope)
 
-=======
->>>>>>> ce/master
         variable = user_project.variables.create(variable_params)
 
         if variable.valid?
@@ -84,13 +81,10 @@ module API
 
         variable_params = declared_params(include_missing: false).except(:key)
 
-<<<<<<< HEAD
         # EE
         variable_params.delete(:environment_scope) unless
             user_project.feature_available?(:variable_environment_scope)
 
-=======
->>>>>>> ce/master
         if variable.update(variable_params)
           present variable, with: Entities::Variable
         else

lib/tasks/gitlab/info.rake

@@ -46,7 +46,6 @@ namespace :gitlab do
       http_clone_url = project.http_url_to_repo
       ssh_clone_url  = project.ssh_url_to_repo
 
-<<<<<<< HEAD
       geo_node_type =
         if Gitlab::Geo.current_node
           Gitlab::Geo.current_node.primary ? 'Primary' : 'Secondary'
@@ -54,8 +53,6 @@ namespace :gitlab do
           'Undefined'.color(:red)
         end
 
-=======
->>>>>>> ce/master
       omniauth_providers = Gitlab.config.omniauth.providers.map { |provider| provider['name'] }
 
       puts ""