Resolve conflicts after CE merge

For next files:

- app/controllers/admin/application_settings_controller.rb
- config/routes/admin.rb
- locale/gitlab.pot
Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

app/controllers/admin/application_settings_controller.rb

 class Admin::ApplicationSettingsController < Admin::ApplicationController
   include InternalRedirect
-<<<<<<< HEAD
   prepend EE::Admin::ApplicationSettingsController
 
-=======
->>>>>>> upstream/master
   before_action :set_application_setting
 
   def show

config/routes/admin.rb

@@ -125,14 +125,11 @@ namespace :admin do
     put :reset_health_check_token
     put :clear_repository_check_states
     get :integrations, :repository, :templates, :ci_cd, :reporting, :metrics_and_profiling, :network, :geo, :preferences
-<<<<<<< HEAD
   end
 
   ## EE-specific
   resource :license, only: [:show, :new, :create, :destroy] do
     get :download, on: :member
-=======
->>>>>>> upstream/master
   end
 
   resources :geo_nodes, only: [:index, :create, :new, :edit, :update]

locale/gitlab.pot

@@ -1280,12 +1280,9 @@ msgstr ""
 msgid "CI / CD Settings"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "CI will run using the credentials assigned above."
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "CI/CD"
 msgstr ""
 
@@ -3350,7 +3347,6 @@ msgstr ""
 msgid "Geo"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Geo Nodes"
 msgstr ""
 
@@ -3627,8 +3623,6 @@ msgstr ""
 msgid "Get a free instance review"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Git"
 msgstr ""
 
@@ -4687,12 +4681,9 @@ msgstr ""
 msgid "Metrics and profiling"
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Metrics|Business"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Metrics|Check out the CI/CD documentation on deploying to an environment"
 msgstr ""
 
@@ -6316,12 +6307,9 @@ msgstr ""
 msgid "Reply to this email directly or %{view_it_on_gitlab}."
 msgstr ""
 
-<<<<<<< HEAD
 msgid "Repo by URL"
 msgstr ""
 
-=======
->>>>>>> upstream/master
 msgid "Reporting"
 msgstr ""