Resolve conflicts in app/controllers/projects/mirrors_controller.rb

app/controllers/projects/mirrors_controller.rb

 class Projects::MirrorsController < Projects::ApplicationController
   include RepositorySettingsRedirect
 
-<<<<<<< HEAD
   prepend EE::Projects::MirrorsController
 
-=======
->>>>>>> upstream/master
   # Authorize
   before_action :remote_mirror, only: [:update]
   before_action :check_mirror_available!